diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolBaseData.xml b/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolBaseData.xml
index 411e9a2128..2d5266b6f2 100644
--- a/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolBaseData.xml
+++ b/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolBaseData.xml
@@ -60,9 +60,9 @@
 							<properties isSystemResource="false" isBlinking="false"
 								isMapLayer="false" isHoverOn="false" isVisible="true">
 							</properties>
-							<resourceData xsi:type="bestResResourceData"
-								productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData"
+								isUpdatingOnMetadataOnly="false"
+								isRequeryNecessaryOnTimeMatch="true" >
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="153,94,19,20"
@@ -80,142 +80,6 @@
 											constraintType="BETWEEN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}"
-													constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="153" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}"
-													constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="94" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}"
-													constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="19" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}"
-													constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="20" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 						<resource>
@@ -230,9 +94,9 @@
 							<properties isSystemResource="false" isBlinking="false"
 								isMapLayer="false" isHoverOn="false" isVisible="true">
 							</properties>
-							<resourceData xsi:type="bestResResourceData"
-								productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" mode="SRM8"
+								isUpdatingOnMetadataOnly="false"
+								isRequeryNecessaryOnTimeMatch="true" >
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="154,99"
@@ -250,74 +114,6 @@
 											constraintType="BETWEEN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" mode="SRM8"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}"
-													constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="154" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" mode="SRM8"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}"
-													constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="99" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 					</resourceData>
@@ -352,9 +148,9 @@
 							<properties isSystemResource="false" isBlinking="false"
 								isMapLayer="false" isHoverOn="false" isVisible="true">
 							</properties>
-							<resourceData xsi:type="bestResResourceData"
-								productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData"
+								isUpdatingOnMetadataOnly="false"
+								isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="159,158"
@@ -372,74 +168,6 @@
 											constraintType="BETWEEN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}"
-													constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="159" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}"
-													constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="158" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 						<resource>
@@ -454,9 +182,9 @@
 							<properties isSystemResource="false" isBlinking="false"
 								isMapLayer="false" isHoverOn="false" isVisible="true">
 							</properties>
-							<resourceData xsi:type="bestResResourceData"
-								productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData"
+								isUpdatingOnMetadataOnly="false"
+								isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="154,99,27,25"
@@ -474,142 +202,6 @@
 											constraintType="BETWEEN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}"
-													constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="154" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}"
-													constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="99" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}"
-													constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="27" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}"
-													constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="25" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 						
@@ -639,8 +231,7 @@
 							</loadProperties>
 							<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
 							</properties>
-							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="163,162" constraintType="IN" />
@@ -655,58 +246,6 @@
 										<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="163" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="162" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 						<resource>
@@ -718,8 +257,7 @@
 							</loadProperties>
 							<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
 							</properties>
-							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="165,164" constraintType="IN" />
@@ -734,58 +272,6 @@
 										<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="165" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="164" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 					</resourceData>
@@ -812,8 +298,7 @@
 							</loadProperties>
 							<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
 							</properties>
-							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="161,160" constraintType="IN" />
@@ -828,58 +313,6 @@
 										<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="161" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="160" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 						<resource>
@@ -891,8 +324,7 @@
 							</loadProperties>
 							<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
 							</properties>
-							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="155,28,29,30" constraintType="IN" />
@@ -907,110 +339,6 @@
 										<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="155" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="28" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="29" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="30" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 					</resourceData>
diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolFourPanelZHCML.xml b/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolFourPanelZHCML.xml
index 9183ec178d..6250e381c8 100644
--- a/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolFourPanelZHCML.xml
+++ b/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolFourPanelZHCML.xml
@@ -6,10 +6,17 @@
 	Contractor_Address:_____6825_Pine_Street,_Suite_340 ________________________Mail_Stop_B8 
 	________________________Omaha,_NE_68106 ________________________402.291.0100 
 	See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. -->
-<!-- loads four panel HCA analysis, looks like this +++++++++++++++++++++++ 
-	+ Z HC + Z HC + + ML + ML + +++++++++++++++++++++++ + Z HC + Z HC + + ML 
-	+ ML + +++++++++++++++++++++++ substitution keys: product the productCode 
-	to load elev a range of elevations to load seperated by two dashes. -->
+<!-- loads four panel HCA analysis, looks like this 
+    +++++++++++++++++++++++ 
+	+  Z   HC  +  Z   HC  + 
+	+    ML    +    ML    + 
+	+++++++++++++++++++++++
+	+  Z   HC  +  Z   HC  + 
+	+    ML    +    ML    +
+	+++++++++++++++++++++++ 
+	substitution keys:
+	   product the productCode to load
+	   elev     a range of elevations to load seperated by two dashes. -->
 <bundle>
 	<displayList>
 		<displays xsi:type="d2DMapRenderableDisplay"
@@ -62,9 +69,9 @@
 									<capability xsi:type="rangeRingsOverlayCapability" />
 								</capabilities>
 							</loadProperties>
-							<resourceData xsi:type="bestResResourceData"
-								productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData"
+								isUpdatingOnMetadataOnly="false"
+								isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="153,94,19,20"
@@ -82,149 +89,13 @@
 											constraintType="IN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation1}"
-													constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="153" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation1}"
-													constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="94" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation1}"
-													constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="19" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation1}"
-													constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="20" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 						
 						<resource>
-							<resourceData xsi:type="bestResResourceData"
-								productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData"
+								isUpdatingOnMetadataOnly="false"
+								isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="165,164"
@@ -242,74 +113,6 @@
 											constraintType="EQUALS" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation1}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="165" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData"
-										isUpdatingOnMetadataOnly="false"
-										isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation1}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="164" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}"
-													constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar"
-													constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						<loadProperties loadWithoutData="true">
 							<capabilities>
@@ -362,8 +165,7 @@
 									<capability xsi:type="rangeRingsOverlayCapability" />
 								</capabilities>
 							</loadProperties>
-							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="153,94,19,20" constraintType="IN" />
@@ -378,116 +180,11 @@
 										<constraint constraintValue="${elevation2}" constraintType="IN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation2}" constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="153" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation2}" constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="94" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation2}" constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="19" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation2}" constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="20" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 						
 						<resource>
-							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="165,164" constraintType="IN" />
@@ -502,58 +199,6 @@
 										<constraint constraintValue="${elevation2}" constraintType="EQUALS" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation2}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="165" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation2}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="164" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						<loadProperties loadWithoutData="true">
 							<capabilities>
@@ -605,8 +250,7 @@
 									<capability xsi:type="rangeRingsOverlayCapability" />
 								</capabilities>
 							</loadProperties>
-							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="153,94,19,20" constraintType="IN" />
@@ -621,116 +265,11 @@
 										<constraint constraintValue="${elevation3}" constraintType="IN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation3}" constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="153" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation3}" constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="94" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation3}" constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="19" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation3}" constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="20" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 						
 						<resource>
-							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">>
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="165,164" constraintType="IN" />
@@ -745,58 +284,6 @@
 										<constraint constraintValue="${elevation3}" constraintType="EQUALS" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation3}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="165" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation3}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="164" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						<loadProperties loadWithoutData="true">
 							<capabilities>
@@ -848,8 +335,7 @@
 									<capability xsi:type="rangeRingsOverlayCapability" />
 								</capabilities>
 							</loadProperties>
-							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="153,94,19,20" constraintType="IN" />
@@ -864,116 +350,11 @@
 										<constraint constraintValue="${elevation4}" constraintType="IN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation4}" constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="153" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation4}" constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="94" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation4}" constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="19" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation4}" constraintType="IN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="20" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 						
 						<resource>
-							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="165,164" constraintType="IN" />
@@ -988,58 +369,6 @@
 										<constraint constraintValue="${elevation4}" constraintType="EQUALS" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation4}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="165" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation4}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="164" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						<loadProperties loadWithoutData="true">
 							<capabilities>
diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolHCA.xml b/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolHCA.xml
index 4f30e8980a..8f78c5c530 100644
--- a/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolHCA.xml
+++ b/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolHCA.xml
@@ -48,9 +48,8 @@
 					<properties isSystemResource="false" isBlinking="false"
 						isMapLayer="false" isHoverOn="false" isVisible="true">
 					</properties>
-					<resourceData xsi:type="bestResResourceData"
-						productIdentifierKey="productCode" retrieveData="false">
-						<enabler xsi:type="radarSpatialEnabler" />
+					<resourceData xsi:type="radarResourceData"
+						isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 						<metadataMap>
 							<mapping key="productCode">
 								<constraint constraintValue="153,94,19,20"
@@ -66,134 +65,6 @@
 								<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
 							</mapping>
 						</metadataMap>
-						<resource>
-							<loadProperties loadWithoutData="true">
-								<capabilities>
-									<capability xsi:type="imagingCapability"
-										interpolationState="false" brightness="1.0" contrast="1.0"
-										alpha="1.0" />
-									<capability xsi:type="rangeRingsOverlayCapability" />
-								</capabilities>
-							</loadProperties>
-							<properties isSystemResource="false" isBlinking="false"
-								isMapLayer="false" isHoverOn="false" isVisible="true">
-							</properties>
-							<resourceData xsi:type="radarResourceData"
-								isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-								<metadataMap>
-									<mapping key="primaryElevationAngle">
-										<constraint constraintValue="${elevation}"
-											constraintType="BETWEEN" />
-									</mapping>
-									<mapping key="productCode">
-										<constraint constraintValue="153" constraintType="EQUALS" />
-									</mapping>
-									<mapping key="icao">
-										<constraint constraintValue="${icao}"
-											constraintType="EQUALS" />
-									</mapping>
-									<mapping key="pluginName">
-										<constraint constraintValue="radar" constraintType="EQUALS" />
-									</mapping>
-								</metadataMap>
-							</resourceData>
-						</resource>
-						<resource>
-							<loadProperties loadWithoutData="true">
-								<capabilities>
-									<capability xsi:type="imagingCapability"
-										interpolationState="false" brightness="1.0" contrast="1.0"
-										alpha="1.0" />
-									<capability xsi:type="rangeRingsOverlayCapability" />
-								</capabilities>
-							</loadProperties>
-							<properties isSystemResource="false" isBlinking="false"
-								isMapLayer="false" isHoverOn="false" isVisible="true">
-							</properties>
-							<resourceData xsi:type="radarResourceData"
-								isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-								<metadataMap>
-									<mapping key="primaryElevationAngle">
-										<constraint constraintValue="${elevation}"
-											constraintType="BETWEEN" />
-									</mapping>
-									<mapping key="productCode">
-										<constraint constraintValue="94" constraintType="EQUALS" />
-									</mapping>
-									<mapping key="icao">
-										<constraint constraintValue="${icao}"
-											constraintType="EQUALS" />
-									</mapping>
-									<mapping key="pluginName">
-										<constraint constraintValue="radar" constraintType="EQUALS" />
-									</mapping>
-								</metadataMap>
-							</resourceData>
-						</resource>
-						<resource>
-							<loadProperties loadWithoutData="true">
-								<capabilities>
-									<capability xsi:type="imagingCapability"
-										interpolationState="false" brightness="1.0" contrast="1.0"
-										alpha="1.0" />
-									<capability xsi:type="rangeRingsOverlayCapability" />
-								</capabilities>
-							</loadProperties>
-							<properties isSystemResource="false" isBlinking="false"
-								isMapLayer="false" isHoverOn="false" isVisible="true">
-							</properties>
-							<resourceData xsi:type="radarResourceData"
-								isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-								<metadataMap>
-									<mapping key="primaryElevationAngle">
-										<constraint constraintValue="${elevation}"
-											constraintType="BETWEEN" />
-									</mapping>
-									<mapping key="productCode">
-										<constraint constraintValue="19" constraintType="EQUALS" />
-									</mapping>
-									<mapping key="icao">
-										<constraint constraintValue="${icao}"
-											constraintType="EQUALS" />
-									</mapping>
-									<mapping key="pluginName">
-										<constraint constraintValue="radar" constraintType="EQUALS" />
-									</mapping>
-								</metadataMap>
-							</resourceData>
-						</resource>
-						<resource>
-							<loadProperties loadWithoutData="true">
-								<capabilities>
-									<capability xsi:type="imagingCapability"
-										interpolationState="false" brightness="1.0" contrast="1.0"
-										alpha="1.0" />
-									<capability xsi:type="rangeRingsOverlayCapability" />
-								</capabilities>
-							</loadProperties>
-							<properties isSystemResource="false" isBlinking="false"
-								isMapLayer="false" isHoverOn="false" isVisible="true">
-							</properties>
-							<resourceData xsi:type="radarResourceData"
-								isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-								<metadataMap>
-									<mapping key="primaryElevationAngle">
-										<constraint constraintValue="${elevation}"
-											constraintType="BETWEEN" />
-									</mapping>
-									<mapping key="productCode">
-										<constraint constraintValue="20" constraintType="EQUALS" />
-									</mapping>
-									<mapping key="icao">
-										<constraint constraintValue="${icao}"
-											constraintType="EQUALS" />
-									</mapping>
-									<mapping key="pluginName">
-										<constraint constraintValue="radar" constraintType="EQUALS" />
-									</mapping>
-								</metadataMap>
-							</resourceData>
-						</resource>
 					</resourceData>
 				</resource>
 			</descriptor>
@@ -214,9 +85,8 @@
 					<properties isSystemResource="false" isBlinking="false"
 						isMapLayer="false" isHoverOn="false" isVisible="true">
 					</properties>
-					<resourceData xsi:type="bestResResourceData"
-						productIdentifierKey="productCode" retrieveData="false">
-						<enabler xsi:type="radarSpatialEnabler" />
+					<resourceData xsi:type="radarResourceData"
+						isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 						<metadataMap>
 							<mapping key="productCode">
 								<constraint constraintValue="159,158"
@@ -232,70 +102,6 @@
 								<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
 							</mapping>
 						</metadataMap>
-						<resource>
-							<loadProperties loadWithoutData="true">
-								<capabilities>
-									<capability xsi:type="imagingCapability"
-										interpolationState="false" brightness="1.0" contrast="1.0"
-										alpha="1.0" />
-									<capability xsi:type="rangeRingsOverlayCapability" />
-								</capabilities>
-							</loadProperties>
-							<properties isSystemResource="false" isBlinking="false"
-								isMapLayer="false" isHoverOn="false" isVisible="true">
-							</properties>
-							<resourceData xsi:type="radarResourceData"
-								isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-								<metadataMap>
-									<mapping key="primaryElevationAngle">
-										<constraint constraintValue="${elevation}"
-											constraintType="BETWEEN" />
-									</mapping>
-									<mapping key="productCode">
-										<constraint constraintValue="159" constraintType="EQUALS" />
-									</mapping>
-									<mapping key="icao">
-										<constraint constraintValue="${icao}"
-											constraintType="EQUALS" />
-									</mapping>
-									<mapping key="pluginName">
-										<constraint constraintValue="radar" constraintType="EQUALS" />
-									</mapping>
-								</metadataMap>
-							</resourceData>
-						</resource>
-						<resource>
-							<loadProperties loadWithoutData="true">
-								<capabilities>
-									<capability xsi:type="imagingCapability"
-										interpolationState="false" brightness="1.0" contrast="1.0"
-										alpha="1.0" />
-									<capability xsi:type="rangeRingsOverlayCapability" />
-								</capabilities>
-							</loadProperties>
-							<properties isSystemResource="false" isBlinking="false"
-								isMapLayer="false" isHoverOn="false" isVisible="true">
-							</properties>
-							<resourceData xsi:type="radarResourceData"
-								isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-								<metadataMap>
-									<mapping key="primaryElevationAngle">
-										<constraint constraintValue="${elevation}"
-											constraintType="BETWEEN" />
-									</mapping>
-									<mapping key="productCode">
-										<constraint constraintValue="158" constraintType="EQUALS" />
-									</mapping>
-									<mapping key="icao">
-										<constraint constraintValue="${icao}"
-											constraintType="EQUALS" />
-									</mapping>
-									<mapping key="pluginName">
-										<constraint constraintValue="radar" constraintType="EQUALS" />
-									</mapping>
-								</metadataMap>
-							</resourceData>
-						</resource>
 					</resourceData>
 				</resource>
 			</descriptor>
@@ -321,8 +127,7 @@
 							</loadProperties>
 							<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
 							</properties>
-							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="163,162" constraintType="IN" />
@@ -337,58 +142,6 @@
 										<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="163" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="162" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 						<resource>
@@ -400,8 +153,7 @@
 							</loadProperties>
 							<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
 							</properties>
-							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="165,164" constraintType="IN" />
@@ -416,58 +168,6 @@
 										<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
 									</mapping>
 								</metadataMap>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="165" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
-								<resource>
-									<loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-									<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-									</properties>
-									<resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-										<metadataMap>
-											<mapping key="primaryElevationAngle">
-												<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
-											</mapping>
-											<mapping key="productCode">
-												<constraint constraintValue="164" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="icao">
-												<constraint constraintValue="${icao}" constraintType="EQUALS" />
-											</mapping>
-											<mapping key="pluginName">
-												<constraint constraintValue="radar" constraintType="EQUALS" />
-											</mapping>
-										</metadataMap>
-									</resourceData>
-								</resource>
 							</resourceData>
 						</resource>
 					</resourceData>
@@ -512,9 +212,8 @@
 					<properties isSystemResource="false" isBlinking="false"
 						isMapLayer="false" isHoverOn="false" isVisible="true">
 					</properties>
-					<resourceData xsi:type="bestResResourceData"
-						productIdentifierKey="productCode" retrieveData="false">
-						<enabler xsi:type="radarSpatialEnabler" />
+					<resourceData xsi:type="radarResourceData"
+						isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 						<metadataMap>
 							<mapping key="productCode">
 								<constraint constraintValue="161,160"
@@ -530,70 +229,6 @@
 								<constraint constraintValue="${elevation}" constraintType="BETWEEN" />
 							</mapping>
 						</metadataMap>
-						<resource>
-							<loadProperties loadWithoutData="true">
-								<capabilities>
-									<capability xsi:type="imagingCapability"
-										interpolationState="false" brightness="1.0" contrast="1.0"
-										alpha="1.0" />
-									<capability xsi:type="rangeRingsOverlayCapability" />
-								</capabilities>
-							</loadProperties>
-							<properties isSystemResource="false" isBlinking="false"
-								isMapLayer="false" isHoverOn="false" isVisible="true">
-							</properties>
-							<resourceData xsi:type="radarResourceData"
-								isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-								<metadataMap>
-									<mapping key="primaryElevationAngle">
-										<constraint constraintValue="${elevation}"
-											constraintType="BETWEEN" />
-									</mapping>
-									<mapping key="productCode">
-										<constraint constraintValue="161" constraintType="EQUALS" />
-									</mapping>
-									<mapping key="icao">
-										<constraint constraintValue="${icao}"
-											constraintType="EQUALS" />
-									</mapping>
-									<mapping key="pluginName">
-										<constraint constraintValue="radar" constraintType="EQUALS" />
-									</mapping>
-								</metadataMap>
-							</resourceData>
-						</resource>
-						<resource>
-							<loadProperties loadWithoutData="true">
-								<capabilities>
-									<capability xsi:type="imagingCapability"
-										interpolationState="false" brightness="1.0" contrast="1.0"
-										alpha="1.0" />
-									<capability xsi:type="rangeRingsOverlayCapability" />
-								</capabilities>
-							</loadProperties>
-							<properties isSystemResource="false" isBlinking="false"
-								isMapLayer="false" isHoverOn="false" isVisible="true">
-							</properties>
-							<resourceData xsi:type="radarResourceData"
-								isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-								<metadataMap>
-									<mapping key="primaryElevationAngle">
-										<constraint constraintValue="${elevation}"
-											constraintType="BETWEEN" />
-									</mapping>
-									<mapping key="productCode">
-										<constraint constraintValue="160" constraintType="EQUALS" />
-									</mapping>
-									<mapping key="icao">
-										<constraint constraintValue="${icao}"
-											constraintType="EQUALS" />
-									</mapping>
-									<mapping key="pluginName">
-										<constraint constraintValue="radar" constraintType="EQUALS" />
-									</mapping>
-								</metadataMap>
-							</resourceData>
-						</resource>
 					</resourceData>
 				</resource>
 			</descriptor>
diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolPrecipAnalysis.xml b/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolPrecipAnalysis.xml
index 615d7c65cc..0bc4f6d2b0 100644
--- a/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolPrecipAnalysis.xml
+++ b/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolPrecipAnalysis.xml
@@ -191,9 +191,9 @@
 							<properties isSystemResource="false" isBlinking="false"
 								isMapLayer="false" isHoverOn="false" isVisible="true">
 							</properties>
-							<resourceData xsi:type="bestResResourceData"
-								productIdentifierKey="productCode" retrieveData="false">
-								<enabler xsi:type="radarSpatialEnabler" />
+							<resourceData xsi:type="radarResourceData"
+								isUpdatingOnMetadataOnly="false"
+								isRequeryNecessaryOnTimeMatch="true">
 								<metadataMap>
 									<mapping key="productCode">
 										<constraint constraintValue="171,172"
@@ -206,62 +206,6 @@
 										<constraint constraintValue="radar" constraintType="EQUALS" />
 									</mapping>
 								</metadataMap>
-				                <resource>
-				                    <loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-				                    <properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-				                    </properties>
-				                    <resourceData xsi:type="radarResourceData"
-														isUpdatingOnMetadataOnly="false"
-														isRequeryNecessaryOnTimeMatch="true">
-									    <metadataMap>
-				                            <mapping key="productCode">
-				                                <constraint constraintValue="172" constraintType="EQUALS"/>
-				                            </mapping>
-				                            <mapping key="icao">
-				                                <constraint constraintValue="${icao}" constraintType="EQUALS"/>
-				                            </mapping>
-				                            <mapping key="pluginName">
-				                                <constraint constraintValue="radar" constraintType="EQUALS"/>
-				                            </mapping>
-				                        </metadataMap>
-				                    </resourceData>
-				                </resource>
-				                <resource>
-				                    <loadProperties loadWithoutData="true">
-										<capabilities>
-											<capability xsi:type="imagingCapability"
-												interpolationState="false" brightness="1.0" contrast="1.0"
-												alpha="1.0" />
-											<capability xsi:type="rangeRingsOverlayCapability" />
-										</capabilities>
-									</loadProperties>
-				                    <properties isSystemResource="false" isBlinking="false"
-										isMapLayer="false" isHoverOn="false" isVisible="true">
-				                    </properties>
-				                    <resourceData xsi:type="radarResourceData"
-														isUpdatingOnMetadataOnly="false"
-														isRequeryNecessaryOnTimeMatch="true">
-									    <metadataMap>
-				                            <mapping key="productCode">
-				                                <constraint constraintValue="171" constraintType="EQUALS"/>
-				                            </mapping>
-				                            <mapping key="icao">
-				                                <constraint constraintValue="${icao}" constraintType="EQUALS"/>
-				                            </mapping>
-				                            <mapping key="pluginName">
-				                                <constraint constraintValue="radar" constraintType="EQUALS"/>
-				                            </mapping>
-				                        </metadataMap>
-				                    </resourceData>
-				                </resource>
 				            </resourceData>
 				        </resource>
 		                <resource>
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/AbstractRequestableResourceData.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/AbstractRequestableResourceData.java
index 7baa0495bd..8056384cfd 100644
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/AbstractRequestableResourceData.java
+++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/AbstractRequestableResourceData.java
@@ -275,6 +275,20 @@ public abstract class AbstractRequestableResourceData extends
         Validate.isTrue(updateData instanceof Object[],
                 "Update expected Object[]");
 
+        if (updateData instanceof PluginDataObject[]) {
+            for (PluginDataObject pdo : (PluginDataObject[]) updateData) {
+                DataTime time = pdo.getDataTime();
+                if (binOffset != null) {
+                    time = binOffset.getNormalizedTime(time);
+                }
+                synchronized (cachedAvailableTimes) {
+                    if (!cachedAvailableTimes.contains(time)) {
+                        cachedAvailableTimes.add(time);
+                    }
+                }
+            }
+        }
+        
         this.fireChangeListeners(ChangeType.DATA_UPDATE, updateData);
     }