diff --git a/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/msg/DataURINotificationMessage.java b/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/msg/DataURINotificationMessage.java
index 7187c0e360..4bd687cbea 100644
--- a/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/msg/DataURINotificationMessage.java
+++ b/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/msg/DataURINotificationMessage.java
@@ -42,9 +42,6 @@ public class DataURINotificationMessage implements ISerializableObject {
     @DynamicSerializeElement
     private String[] dataURIs;
 
-    @DynamicSerializeElement
-    private int[] ids;
-
     /**
      * @return the dataURIs
      */
@@ -52,18 +49,6 @@ public class DataURINotificationMessage implements ISerializableObject {
         return dataURIs;
     }
 
-    public int[] getIds() {
-        return ids;
-    }
-
-    /**
-     * @param ids
-     *            The ids to set
-     */
-    public void setIds(int[] ids) {
-        this.ids = ids;
-    }
-
     /**
      * @param dataURIs
      *            the dataURIs to set
diff --git a/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/msg/PracticeDataURINotificationMessage.java b/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/msg/PracticeDataURINotificationMessage.java
index cd80f1d55a..f5dbb9ad8a 100644
--- a/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/msg/PracticeDataURINotificationMessage.java
+++ b/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/msg/PracticeDataURINotificationMessage.java
@@ -42,9 +42,6 @@ public class PracticeDataURINotificationMessage implements ISerializableObject {
     @DynamicSerializeElement
     private String[] dataURIs;
 
-    @DynamicSerializeElement
-    private int[] ids;
-
     /**
      * @return the dataURIs
      */
@@ -52,18 +49,6 @@ public class PracticeDataURINotificationMessage implements ISerializableObject {
         return dataURIs;
     }
 
-    public int[] getIds() {
-        return ids;
-    }
-
-    /**
-     * @param ids
-     *            The ids to set
-     */
-    public void setIds(int[] ids) {
-        this.ids = ids;
-    }
-
     /**
      * @param dataURIs
      *            the dataURIs to set
diff --git a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/DataUriAggregator.java b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/DataUriAggregator.java
index 92e935966f..c55f79d785 100644
--- a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/DataUriAggregator.java
+++ b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/DataUriAggregator.java
@@ -44,8 +44,6 @@ public class DataUriAggregator {
 
     private List<String> dataUris = new ArrayList<String>();
 
-    private List<Integer> ids = new ArrayList<Integer>();
-
     /**
      * Add data uris to the queue
      * 
@@ -55,11 +53,7 @@ public class DataUriAggregator {
         synchronized (this) {
             for (String uri : uris) {
                 if (uri != null) {
-                    int idx = uri.lastIndexOf('/');
-                    Integer id = Integer.valueOf(uri.substring(idx + 1));
-                    uri = uri.substring(0, idx);
                     dataUris.add(uri);
-                    ids.add(id);
                 }
             }
         }
@@ -73,7 +67,7 @@ public class DataUriAggregator {
      */
     public boolean hasUris(Object obj) {
         synchronized (this) {
-            return dataUris.size() > 0 || ids.size() > 0;
+            return dataUris.size() > 0;
         }
     }
 
@@ -85,16 +79,9 @@ public class DataUriAggregator {
     public DataURINotificationMessage sendQueuedUris() {
         synchronized (this) {
             String[] uris = dataUris.toArray(new String[dataUris.size()]);
-            int[] ids = new int[this.ids.size()];
-            int idx = 0;
-            for (Integer i : this.ids) {
-                ids[idx++] = i.intValue();
-            }
             dataUris.clear();
-            this.ids.clear();
             DataURINotificationMessage msg = new DataURINotificationMessage();
             msg.setDataURIs(uris);
-            msg.setIds(ids);
             return msg;
         }
     }
@@ -107,16 +94,9 @@ public class DataUriAggregator {
     public PracticeDataURINotificationMessage sendPracticeQueuedUris() {
         synchronized (this) {
             String[] uris = dataUris.toArray(new String[dataUris.size()]);
-            int[] ids = new int[this.ids.size()];
-            int idx = 0;
-            for (Integer i : this.ids) {
-                ids[idx++] = i.intValue();
-            }
             dataUris.clear();
-            this.ids.clear();
             PracticeDataURINotificationMessage msg = new PracticeDataURINotificationMessage();
             msg.setDataURIs(uris);
-            msg.setIds(ids);
             return msg;
         }
     }
diff --git a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/ToDataURI.java b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/ToDataURI.java
index 685b29bf46..d47fbbbe02 100644
--- a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/ToDataURI.java
+++ b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/ToDataURI.java
@@ -42,13 +42,13 @@ public class ToDataURI {
     public String[] toDataURI(PluginDataObject[] pdo) {
         String[] strs = new String[pdo.length];
         for (int i = 0; i < strs.length; i++) {
-            strs[i] = pdo[i].getDataURI() + '/' + pdo[i].getId();
+            strs[i] = pdo[i].getDataURI();
         }
 
         return strs;
     }
 
     public String toDataURI(PluginDataObject pdo) {
-        return pdo.getDataURI() + '/' + pdo.getId();
+        return pdo.getDataURI();
     }
 }
diff --git a/nativeLib/edex_com/.cproject b/nativeLib/edex_com/.cproject
index f34df1438c..c74c136ad4 100644
--- a/nativeLib/edex_com/.cproject
+++ b/nativeLib/edex_com/.cproject
@@ -67,6 +67,7 @@
 								</option>
 								<option id="gnu.cpp.link.option.paths.1136584520" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="/usr/local/lib"/>
+									<listOptionValue builtIn="false" value="/awips2/notification/lib"/>
 									<listOptionValue builtIn="false" value="/usr/kerberos/lib"/>
 									<listOptionValue builtIn="false" value="/awips2/qpid/lib"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.apache.thrift/lib}&quot;"/>
diff --git a/nativeLib/edex_com/src/EdexNotification.cpp b/nativeLib/edex_com/src/EdexNotification.cpp
index 45abdcb957..30532531f1 100644
--- a/nativeLib/edex_com/src/EdexNotification.cpp
+++ b/nativeLib/edex_com/src/EdexNotification.cpp
@@ -47,7 +47,7 @@ EdexNotification::EdexNotification(const string & brokerURI) {
 	this->brokerURI = brokerURI;
 	this->isConnected = false;
 	this->listSize = 0;
-	this->mess = new DataURINotificationMessage();
+	this->mess = new com_raytheon_edex_msg_DataURINotificationMessage();
 	this->timeout = false;
 	this->timeoutLength = 999999;
 	this->subman = NULL;
diff --git a/nativeLib/edex_com/src/EdexNotification.h b/nativeLib/edex_com/src/EdexNotification.h
index 93b5307ead..c12023d236 100644
--- a/nativeLib/edex_com/src/EdexNotification.h
+++ b/nativeLib/edex_com/src/EdexNotification.h
@@ -69,7 +69,7 @@ private:
 	bool sessionTransacted;
 	bool isConnected;
 	int listSize;
-	DataURINotificationMessage * mess;
+	com_raytheon_edex_msg_DataURINotificationMessage * mess;
 	SubscriptionManager * subman;
 	vector<string>::iterator myStringIterator;
 	std::string brokerURI;
diff --git a/nativeLib/edex_com/src/Notification_constants.cpp b/nativeLib/edex_com/src/Notification_constants.cpp
index e4b84587b7..b581840add 100644
--- a/nativeLib/edex_com/src/Notification_constants.cpp
+++ b/nativeLib/edex_com/src/Notification_constants.cpp
@@ -1,44 +1,8 @@
-/*****************************************************************************************
- * COPYRIGHT (c), 2009, RAYTHEON COMPANY
- * ALL RIGHTS RESERVED, An Unpublished Work
- *
- * RAYTHEON PROPRIETARY
- * If the end user is not the U.S. Government or any agency thereof, use
- * or disclosure of data contained in this source code file is subject to
- * the proprietary restrictions set forth in the Master Rights File.
- *
- * U.S. GOVERNMENT PURPOSE RIGHTS NOTICE
- * If the end user is the U.S. Government or any agency thereof, this source
- * code is provided to the U.S. Government with Government Purpose Rights.
- * Use or disclosure of data contained in this source code file is subject to
- * the "Government Purpose Rights" restriction in the Master Rights File.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * Use or disclosure of data contained in this source code file is subject to
- * the export restrictions set forth in the Master Rights File.
- ******************************************************************************************/
-
-/*
- * Auto-generated code to handle the thrift messages.
- *
- * <pre>
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#     Engineer    Description
- * ------------ ----------  ----------- --------------------------
- * 11/9/09       3375       brockwoo    Initial Creation
- *
- * </pre>
- *
- * @author brockwoo
- * @version 1
- */
-
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.8.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 #include "Notification_constants.h"
 
diff --git a/nativeLib/edex_com/src/Notification_constants.h b/nativeLib/edex_com/src/Notification_constants.h
index 4829be6ea7..de25854733 100644
--- a/nativeLib/edex_com/src/Notification_constants.h
+++ b/nativeLib/edex_com/src/Notification_constants.h
@@ -1,44 +1,8 @@
-/*****************************************************************************************
- * COPYRIGHT (c), 2009, RAYTHEON COMPANY
- * ALL RIGHTS RESERVED, An Unpublished Work
- *
- * RAYTHEON PROPRIETARY
- * If the end user is not the U.S. Government or any agency thereof, use
- * or disclosure of data contained in this source code file is subject to
- * the proprietary restrictions set forth in the Master Rights File.
- *
- * U.S. GOVERNMENT PURPOSE RIGHTS NOTICE
- * If the end user is the U.S. Government or any agency thereof, this source
- * code is provided to the U.S. Government with Government Purpose Rights.
- * Use or disclosure of data contained in this source code file is subject to
- * the "Government Purpose Rights" restriction in the Master Rights File.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * Use or disclosure of data contained in this source code file is subject to
- * the export restrictions set forth in the Master Rights File.
- ******************************************************************************************/
-
-/*
- * Auto-generated code to handle the thrift messages.
- *
- * <pre>
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#     Engineer    Description
- * ------------ ----------  ----------- --------------------------
- * 11/9/09       3375       brockwoo    Initial Creation
- *
- * </pre>
- *
- * @author brockwoo
- * @version 1
- */
-
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.8.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 #ifndef Notification_CONSTANTS_H
 #define Notification_CONSTANTS_H
diff --git a/nativeLib/edex_com/src/Notification_types.cpp b/nativeLib/edex_com/src/Notification_types.cpp
index 549585e465..af0e50d469 100644
--- a/nativeLib/edex_com/src/Notification_types.cpp
+++ b/nativeLib/edex_com/src/Notification_types.cpp
@@ -1,78 +1,42 @@
-/*****************************************************************************************
- * COPYRIGHT (c), 2009, RAYTHEON COMPANY
- * ALL RIGHTS RESERVED, An Unpublished Work
- *
- * RAYTHEON PROPRIETARY
- * If the end user is not the U.S. Government or any agency thereof, use
- * or disclosure of data contained in this source code file is subject to
- * the proprietary restrictions set forth in the Master Rights File.
- *
- * U.S. GOVERNMENT PURPOSE RIGHTS NOTICE
- * If the end user is the U.S. Government or any agency thereof, this source
- * code is provided to the U.S. Government with Government Purpose Rights.
- * Use or disclosure of data contained in this source code file is subject to
- * the "Government Purpose Rights" restriction in the Master Rights File.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * Use or disclosure of data contained in this source code file is subject to
- * the export restrictions set forth in the Master Rights File.
- ******************************************************************************************/
-
-/*
- * Auto-generated code to handle the thrift messages.
- *
- * <pre>
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#     Engineer    Description
- * ------------ ----------  ----------- --------------------------
- * 11/9/09       3375       brockwoo    Initial Creation
- *
- * </pre>
- *
- * @author brockwoo
- * @version 1
- */
-
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.8.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 #include "Notification_types.h"
 
 
 
-const char* DataURINotificationMessage::ascii_fingerprint = "544A7C2D0FBAA52B283383658874CC1E";
-const uint8_t DataURINotificationMessage::binary_fingerprint[16] = {0x54,0x4A,0x7C,0x2D,0x0F,0xBA,0xA5,0x2B,0x28,0x33,0x83,0x65,0x88,0x74,0xCC,0x1E};
+const char* com_raytheon_edex_msg_DataURINotificationMessage::ascii_fingerprint = "ACE4F644F0FDD289DDC4EE5B83BC13C0";
+const uint8_t com_raytheon_edex_msg_DataURINotificationMessage::binary_fingerprint[16] = {0xAC,0xE4,0xF6,0x44,0xF0,0xFD,0xD2,0x89,0xDD,0xC4,0xEE,0x5B,0x83,0xBC,0x13,0xC0};
 
-uint32_t DataURINotificationMessage::read(apache::thrift::protocol::TProtocol* iprot) {
+uint32_t com_raytheon_edex_msg_DataURINotificationMessage::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  apache::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using apache::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == apache::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == apache::thrift::protocol::T_LIST) {
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->dataURIs.clear();
             uint32_t _size0;
-            apache::thrift::protocol::TType _etype3;
+            ::apache::thrift::protocol::TType _etype3;
             iprot->readListBegin(_etype3, _size0);
             this->dataURIs.resize(_size0);
             uint32_t _i4;
@@ -87,26 +51,6 @@ uint32_t DataURINotificationMessage::read(apache::thrift::protocol::TProtocol* i
           xfer += iprot->skip(ftype);
         }
         break;
-      case 2:
-        if (ftype == apache::thrift::protocol::T_LIST) {
-          {
-            this->ids.clear();
-            uint32_t _size5;
-            apache::thrift::protocol::TType _etype8;
-            iprot->readListBegin(_etype8, _size5);
-            this->ids.resize(_size5);
-            uint32_t _i9;
-            for (_i9 = 0; _i9 < _size5; ++_i9)
-            {
-              xfer += iprot->readI32(this->ids[_i9]);
-            }
-            iprot->readListEnd();
-          }
-          this->__isset.ids = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -119,27 +63,16 @@ uint32_t DataURINotificationMessage::read(apache::thrift::protocol::TProtocol* i
   return xfer;
 }
 
-uint32_t DataURINotificationMessage::write(apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t com_raytheon_edex_msg_DataURINotificationMessage::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("DataURINotificationMessage");
-  xfer += oprot->writeFieldBegin("dataURIs", apache::thrift::protocol::T_LIST, 1);
+  xfer += oprot->writeStructBegin("com_raytheon_edex_msg_DataURINotificationMessage");
+  xfer += oprot->writeFieldBegin("dataURIs", ::apache::thrift::protocol::T_LIST, 1);
   {
-    xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->dataURIs.size());
-    std::vector<std::string> ::const_iterator _iter10;
-    for (_iter10 = this->dataURIs.begin(); _iter10 != this->dataURIs.end(); ++_iter10)
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->dataURIs.size()));
+    std::vector<std::string> ::const_iterator _iter5;
+    for (_iter5 = this->dataURIs.begin(); _iter5 != this->dataURIs.end(); ++_iter5)
     {
-      xfer += oprot->writeString((*_iter10));
-    }
-    xfer += oprot->writeListEnd();
-  }
-  xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("ids", apache::thrift::protocol::T_LIST, 2);
-  {
-    xfer += oprot->writeListBegin(apache::thrift::protocol::T_I32, this->ids.size());
-    std::vector<int32_t> ::const_iterator _iter11;
-    for (_iter11 = this->ids.begin(); _iter11 != this->ids.end(); ++_iter11)
-    {
-      xfer += oprot->writeI32((*_iter11));
+      xfer += oprot->writeString((*_iter5));
     }
     xfer += oprot->writeListEnd();
   }
diff --git a/nativeLib/edex_com/src/Notification_types.h b/nativeLib/edex_com/src/Notification_types.h
index f9317020b5..b4fda7cc64 100644
--- a/nativeLib/edex_com/src/Notification_types.h
+++ b/nativeLib/edex_com/src/Notification_types.h
@@ -1,49 +1,14 @@
-/*****************************************************************************************
- * COPYRIGHT (c), 2009, RAYTHEON COMPANY
- * ALL RIGHTS RESERVED, An Unpublished Work
- *
- * RAYTHEON PROPRIETARY
- * If the end user is not the U.S. Government or any agency thereof, use
- * or disclosure of data contained in this source code file is subject to
- * the proprietary restrictions set forth in the Master Rights File.
- *
- * U.S. GOVERNMENT PURPOSE RIGHTS NOTICE
- * If the end user is the U.S. Government or any agency thereof, this source
- * code is provided to the U.S. Government with Government Purpose Rights.
- * Use or disclosure of data contained in this source code file is subject to
- * the "Government Purpose Rights" restriction in the Master Rights File.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * Use or disclosure of data contained in this source code file is subject to
- * the export restrictions set forth in the Master Rights File.
- ******************************************************************************************/
-
-/*
- * Auto-generated code to handle the thrift messages.
- *
- * <pre>
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#     Engineer    Description
- * ------------ ----------  ----------- --------------------------
- * 11/9/09       3375       brockwoo    Initial Creation
- *
- * </pre>
- *
- * @author brockwoo
- * @version 1
- */
-
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.8.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 #ifndef Notification_TYPES_H
 #define Notification_TYPES_H
 
 #include <Thrift.h>
+#include <TApplicationException.h>
 #include <protocol/TProtocol.h>
 #include <transport/TTransport.h>
 
@@ -51,42 +16,44 @@
 
 
 
-class DataURINotificationMessage {
+typedef struct _com_raytheon_edex_msg_DataURINotificationMessage__isset {
+  _com_raytheon_edex_msg_DataURINotificationMessage__isset() : dataURIs(false) {}
+  bool dataURIs;
+} _com_raytheon_edex_msg_DataURINotificationMessage__isset;
+
+class com_raytheon_edex_msg_DataURINotificationMessage {
  public:
 
-  static const char* ascii_fingerprint; // = "544A7C2D0FBAA52B283383658874CC1E";
-  static const uint8_t binary_fingerprint[16]; // = {0x54,0x4A,0x7C,0x2D,0x0F,0xBA,0xA5,0x2B,0x28,0x33,0x83,0x65,0x88,0x74,0xCC,0x1E};
+  static const char* ascii_fingerprint; // = "ACE4F644F0FDD289DDC4EE5B83BC13C0";
+  static const uint8_t binary_fingerprint[16]; // = {0xAC,0xE4,0xF6,0x44,0xF0,0xFD,0xD2,0x89,0xDD,0xC4,0xEE,0x5B,0x83,0xBC,0x13,0xC0};
 
-  DataURINotificationMessage() {
+  com_raytheon_edex_msg_DataURINotificationMessage() {
   }
 
-  virtual ~DataURINotificationMessage() throw() {}
+  virtual ~com_raytheon_edex_msg_DataURINotificationMessage() throw() {}
 
   std::vector<std::string>  dataURIs;
-  std::vector<int32_t>  ids;
 
-  struct __isset {
-    __isset() : dataURIs(false), ids(false) {}
-    bool dataURIs;
-    bool ids;
-  } __isset;
+  _com_raytheon_edex_msg_DataURINotificationMessage__isset __isset;
 
-  bool operator == (const DataURINotificationMessage & rhs) const
+  void __set_dataURIs(const std::vector<std::string> & val) {
+    dataURIs = val;
+  }
+
+  bool operator == (const com_raytheon_edex_msg_DataURINotificationMessage & rhs) const
   {
     if (!(dataURIs == rhs.dataURIs))
       return false;
-    if (!(ids == rhs.ids))
-      return false;
     return true;
   }
-  bool operator != (const DataURINotificationMessage &rhs) const {
+  bool operator != (const com_raytheon_edex_msg_DataURINotificationMessage &rhs) const {
     return !(*this == rhs);
   }
 
-  bool operator < (const DataURINotificationMessage & ) const;
+  bool operator < (const com_raytheon_edex_msg_DataURINotificationMessage & ) const;
 
-  uint32_t read(apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(apache::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
diff --git a/rpms/awips2.core/Installer.notification/component.spec b/rpms/awips2.core/Installer.notification/component.spec
index bb8e97a4b8..7f57faf1dd 100644
--- a/rpms/awips2.core/Installer.notification/component.spec
+++ b/rpms/awips2.core/Installer.notification/component.spec
@@ -39,8 +39,9 @@ fi
 mkdir -p ${RPM_BUILD_ROOT}/awips2/notification
 mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d
 
-PROFILE_D_DIR="Installer.rpm/awips2.core/Installer.notification/scripts/profile.d"
-cp ${WORKSPACE_DIR}/${PROFILE_D_DIR}/* ${RPM_BUILD_ROOT}/etc/profile.d
+RPM_CORE_PROJECT_DIR="${WORKSPACE_DIR}/Installer.rpm/awips2.core"
+PROFILE_D_DIR="${RPM_CORE_PROJECT_DIR}/Installer.notification/scripts/profile.d"
+cp ${PROFILE_D_DIR}/* ${RPM_BUILD_ROOT}/etc/profile.d
 
 %build
 #---------------------------------------------------------------------------#
@@ -76,13 +77,21 @@ function copyLegal()
       
    rm -f ${WORKSPACE_DIR}/Installer.rpm/legal/FOSS_licenses.tar    
 }
-NOTIFICATION_TAR_FILE_DIR="packages/notification"
+RPM_CORE_PROJECT_DIR="${WORKSPACE_DIR}/Installer.rpm/awips2.core"
+NOTIFICATION_TAR_FILE_DIR="${RPM_CORE_PROJECT_DIR}/Installer.notification/src"
 NOTIFICATION_TAR_FILE="${NOTIFICATION_TAR_FILE_DIR}/edex_com.tar.bz2"
 
 cd ${RPM_BUILD_ROOT}/awips2
-/bin/gtar -xpf ${AWIPSCM_SHARE}/${NOTIFICATION_TAR_FILE}
+/bin/gtar -xpf ${NOTIFICATION_TAR_FILE}
+if [ $? -ne 0 ]; then
+   exit 1
+fi
 
-cp -r ${RPM_BUILD_ROOT}/awips2/edex_com/* ${RPM_BUILD_ROOT}/awips2/notification/
+cp -r ${RPM_BUILD_ROOT}/awips2/edex_com/* \
+   ${RPM_BUILD_ROOT}/awips2/notification/
+if [ $? -ne 0 ]; then
+   exit 1
+fi
 # Remove the boost rpms directory
 rm -rf ${RPM_BUILD_ROOT}/awips2/notification/rpms
 rm -rf ${RPM_BUILD_ROOT}/awips2/edex_com
diff --git a/rpms/awips2.core/Installer.notification/src/edex_com.tar.bz2 b/rpms/awips2.core/Installer.notification/src/edex_com.tar.bz2
new file mode 100644
index 0000000000..f1697b7745
Binary files /dev/null and b/rpms/awips2.core/Installer.notification/src/edex_com.tar.bz2 differ