diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index a28b6ba957..b302e1c2c4 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -304,6 +304,10 @@
              <param name="feature"
                   value="com.raytheon.uf.viz.gisdatastore.feature" />
         </antcall>
+	<antcall target="p2.build.repo">
+	     <param name="feature"
+		  value="com.raytheon.viz.dataaccess.feature" />
+	</antcall>
 
 		<antcall target="cleanup.features" />
 	</target>
diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java
index de225c36c7..84660a393c 100644
--- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java
+++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java
@@ -260,8 +260,7 @@ public class SatelliteDataCubeAdapter implements IDataCubeAdapter {
         derivedRequest = new DerivedParameterRequest(derivedRequest);
         for (Object param : derivedRequest.getBaseParams()) {
             records.add((SatelliteRecord) param);
-            hdf5Files.add(HDF5Util.findHDF5Location((SatelliteRecord) param)
-                    .getAbsoluteFile());
+            hdf5Files.add(HDF5Util.findHDF5Location((SatelliteRecord) param));
             datasets.add(getDataset(((SatelliteRecord) param).getDataURI(),
                     dataset));
         }
diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatFileBasedTileSet.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatFileBasedTileSet.java
index 173b06ac23..546f120101 100644
--- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatFileBasedTileSet.java
+++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatFileBasedTileSet.java
@@ -83,7 +83,7 @@ public class SatFileBasedTileSet extends FileBasedTileSet {
 
     public SatFileBasedTileSet(PluginDataObject pdo, String dataset,
             AbstractTileSet sharedGeometryTileset) throws VizException {
-        super(HDF5Util.findHDF5Location(pdo).getAbsolutePath(), pdo
+        super(HDF5Util.findHDF5Location(pdo).getPath(), pdo
                 .getDataURI(), dataset, sharedGeometryTileset);
         this.pdo = pdo;
     }
@@ -91,7 +91,7 @@ public class SatFileBasedTileSet extends FileBasedTileSet {
     public SatFileBasedTileSet(PluginDataObject pdo, String dataset,
             int levels, int tileSize, GridGeometry2D gridGeometry,
             AbstractVizResource<?, ?> rsc, String viewType) throws VizException {
-        super(HDF5Util.findHDF5Location(pdo).getAbsolutePath(), pdo
+        super(HDF5Util.findHDF5Location(pdo).getPath(), pdo
                 .getDataURI(), dataset, levels, tileSize, gridGeometry, rsc,
                 viewType);
         this.pdo = pdo;
@@ -101,7 +101,7 @@ public class SatFileBasedTileSet extends FileBasedTileSet {
             int levels, int tileSize, GridGeometry2D gridGeometry,
             AbstractVizResource<?, ?> rsc, PixelInCell pixelOrientation,
             String viewType) throws VizException {
-        super(HDF5Util.findHDF5Location(pdo).getAbsolutePath(), pdo
+        super(HDF5Util.findHDF5Location(pdo).getPath(), pdo
                 .getDataURI(), dataset, levels, tileSize, gridGeometry, rsc,
                 pixelOrientation, viewType);
         this.pdo = pdo;
diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java b/ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
index 9ca878ef37..ebdea90c43 100644
--- a/ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
+++ b/ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
@@ -130,12 +130,11 @@ public class NcscatResource extends
             // Given the NcscatRecord, locate the associated HDF5 data...
             File location = HDF5Util.findHDF5Location(nsRecord);
 
-            String hdf5File = location.getAbsolutePath();
             String group = nsRecord.getDataURI();
             String dataset = "Ncscat";
 
             // ...and retrieve it
-            IDataStore ds = DataStoreFactory.getDataStore(new File(hdf5File));
+            IDataStore ds = DataStoreFactory.getDataStore(location);
             IDataRecord dr;
             try {
                 dr = ds.retrieve(group, dataset, Request.ALL);