diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.core.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.core.feature/feature.xml
index 735acec18d..11ef624975 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.core.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.core.feature/feature.xml
@@ -21,6 +21,12 @@
          id="com.raytheon.uf.edex.registry.client.feature"
          version="0.0.0"/>
 
+   <plugin
+         id="ll.netcdf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
    <plugin
          id="net.opengis"
          download-size="0"
@@ -74,12 +80,60 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.w3.XMLSchema"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="com.raytheon.uf.common.nc4"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.edex.plugin.unitconverter"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.edex.plugin.dataset.urn"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.raytheon.uf.edex.ogc.common"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+   <plugin
+         id="com.raytheon.uf.edex.plugin.grib.ogc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.edex.plugin.obs.ogc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.edex.plugin.madis.ogc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="com.raytheon.uf.edex.wfs"
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
index 54e4b0212b..1aea0015a9 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
@@ -26,6 +26,20 @@
       <import feature="com.raytheon.uf.edex.datadelivery.core.feature" version="0.0.0"/>
    </requires>
 
+   <plugin
+         id="org.apache.commons.compress"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="edu.uci.ics.crawler4j"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.raytheon.uf.edex.datadelivery.bandwidth"
          download-size="0"
@@ -40,13 +54,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="edu.uci.ics.crawler4j"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.edex.datadelivery.event"
          download-size="0"
@@ -74,18 +81,5 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-   <plugin
-         id="org.w3.XMLSchema"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
 
-   <plugin
-         id="com.raytheon.uf.common.nc4"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-   
 </feature>
diff --git a/edexOsgi/com.raytheon.uf.edex.dataprovideragent.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.dataprovideragent.feature/feature.xml
index e879c38096..70360e091a 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataprovideragent.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dataprovideragent.feature/feature.xml
@@ -17,26 +17,9 @@
       [Enter License Description here.]
    </license>
 
-   <plugin
-         id="com.raytheon.uf.edex.plugin.grib.ogc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.raytheon.uf.edex.plugin.obs.ogc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.raytheon.uf.edex.plugin.madis.ogc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="com.raytheon.uf.edex.datadelivery.core.feature"
+         version="0.0.0"/>
 
    <plugin
          id="com.raytheon.uf.edex.ogc.registry"