diff --git a/ems/src/main/java/org/openremote/extension/ems/agent/EmsDayAheadAsset.java b/ems/src/main/java/org/openremote/extension/ems/agent/EmsDayAheadAsset.java
index 7ef5057..8f3b3b1 100644
--- a/ems/src/main/java/org/openremote/extension/ems/agent/EmsDayAheadAsset.java
+++ b/ems/src/main/java/org/openremote/extension/ems/agent/EmsDayAheadAsset.java
@@ -41,7 +41,6 @@ public class EmsDayAheadAsset extends Asset<EmsDayAheadAsset> {
       new AttributeDescriptor<>(
           "lastUpdateForecasts",
           ValueType.TEXT,
-          new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
           new MetaItem<>(MetaItemType.READ_ONLY),
           new MetaItem<>(MetaItemType.STORE_DATA_POINTS));
 
@@ -49,7 +48,6 @@ public class EmsDayAheadAsset extends Asset<EmsDayAheadAsset> {
       new AttributeDescriptor<>(
               "tariffExportDayAheadForecast",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
           .withUnits("EUR", UNITS_PER, UNITS_KILO, UNITS_WATT, UNITS_HOUR);
@@ -58,7 +56,6 @@ public class EmsDayAheadAsset extends Asset<EmsDayAheadAsset> {
       new AttributeDescriptor<>(
               "tariffImportDayAheadForecast",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
           .withUnits("EUR", UNITS_PER, UNITS_KILO, UNITS_WATT, UNITS_HOUR);
diff --git a/ems/src/main/java/org/openremote/extension/ems/agent/EmsElectricityBatteryAsset.java b/ems/src/main/java/org/openremote/extension/ems/agent/EmsElectricityBatteryAsset.java
index b332640..a5f597f 100644
--- a/ems/src/main/java/org/openremote/extension/ems/agent/EmsElectricityBatteryAsset.java
+++ b/ems/src/main/java/org/openremote/extension/ems/agent/EmsElectricityBatteryAsset.java
@@ -61,7 +61,6 @@ public enum EmsElectricityBatteryConnectionStatusValueType {
           new AttributeDescriptor<>(
               "connectionStatus",
               CONNECTION_STATUS_VALUE_TYPE,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS));
 
@@ -82,7 +81,6 @@ public enum EmsElectricityBatteryConnectionStatusValueType {
       new AttributeDescriptor<>(
               "energyLevel",
               ValueType.POSITIVE_NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.RULE_STATE),
@@ -93,7 +91,6 @@ public enum EmsElectricityBatteryConnectionStatusValueType {
       new AttributeDescriptor<>(
               "energyLevelPercentage",
               ValueType.POSITIVE_NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.RULE_STATE),
@@ -112,7 +109,6 @@ public enum EmsElectricityBatteryConnectionStatusValueType {
       new AttributeDescriptor<>(
               "power",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.RULE_STATE),
@@ -123,7 +119,6 @@ public enum EmsElectricityBatteryConnectionStatusValueType {
       new AttributeDescriptor<>(
               "powerSetpoint",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.RULE_STATE),
diff --git a/ems/src/main/java/org/openremote/extension/ems/agent/EmsEnergyOptimisationAsset.java b/ems/src/main/java/org/openremote/extension/ems/agent/EmsEnergyOptimisationAsset.java
index 429b815..02feae6 100644
--- a/ems/src/main/java/org/openremote/extension/ems/agent/EmsEnergyOptimisationAsset.java
+++ b/ems/src/main/java/org/openremote/extension/ems/agent/EmsEnergyOptimisationAsset.java
@@ -45,7 +45,6 @@ public class EmsEnergyOptimisationAsset extends Asset<EmsEnergyOptimisationAsset
       new AttributeDescriptor<>(
               "energyExportTotal",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
           .withUnits(UNITS_KILO, UNITS_WATT, UNITS_HOUR);
@@ -54,7 +53,6 @@ public class EmsEnergyOptimisationAsset extends Asset<EmsEnergyOptimisationAsset
       new AttributeDescriptor<>(
               "energyImportTotal",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
           .withUnits(UNITS_KILO, UNITS_WATT, UNITS_HOUR);
@@ -88,7 +86,6 @@ public enum OptimisationMethodValueType {
       new AttributeDescriptor<>(
               "powerConsumption",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.RULE_STATE),
@@ -99,7 +96,6 @@ public enum OptimisationMethodValueType {
       new AttributeDescriptor<>(
               "powerFlexible",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.RULE_STATE),
@@ -110,7 +106,6 @@ public enum OptimisationMethodValueType {
       new AttributeDescriptor<>(
               "powerNet",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.RULE_STATE),
@@ -121,7 +116,6 @@ public enum OptimisationMethodValueType {
       new AttributeDescriptor<>(
               "powerProduction",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.RULE_STATE),
@@ -136,7 +130,6 @@ public enum OptimisationMethodValueType {
       new AttributeDescriptor<>(
               "powerLimitMaximumProfileManual",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
@@ -152,7 +145,6 @@ public enum OptimisationMethodValueType {
       new AttributeDescriptor<>(
               "powerLimitMaximumProfileTotal",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
@@ -166,7 +158,6 @@ public enum OptimisationMethodValueType {
       new AttributeDescriptor<>(
               "powerLimitMinimumProfileManual",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
@@ -182,7 +173,6 @@ public enum OptimisationMethodValueType {
       new AttributeDescriptor<>(
               "powerLimitMinimumProfileTotal",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
@@ -192,7 +182,6 @@ public enum OptimisationMethodValueType {
       new AttributeDescriptor<>(
               "tariffExport",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.RULE_STATE),
@@ -203,7 +192,6 @@ public enum OptimisationMethodValueType {
       new AttributeDescriptor<>(
               "tariffImport",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.RULE_STATE),
diff --git a/ems/src/main/java/org/openremote/extension/ems/agent/EmsGOPACSAsset.java b/ems/src/main/java/org/openremote/extension/ems/agent/EmsGOPACSAsset.java
index df96de6..e22c65c 100644
--- a/ems/src/main/java/org/openremote/extension/ems/agent/EmsGOPACSAsset.java
+++ b/ems/src/main/java/org/openremote/extension/ems/agent/EmsGOPACSAsset.java
@@ -42,7 +42,6 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
       new AttributeDescriptor<>(
               "currentPowerFlexRequest",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
@@ -52,7 +51,6 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
       new AttributeDescriptor<>(
               "powerLimitMaximumProfileFlexOrder",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
@@ -62,7 +60,6 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
       new AttributeDescriptor<>(
               "powerLimitMinimumProfileFlexOrder",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
@@ -72,7 +69,6 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
       new AttributeDescriptor<>(
               "powerMaximumFlexRequest",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
@@ -82,7 +78,6 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
       new AttributeDescriptor<>(
               "powerMinimumFlexRequest",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
@@ -126,7 +121,6 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
       new AttributeDescriptor<>(
               "redispatchRequestedPower",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
@@ -154,7 +148,6 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
       new AttributeDescriptor<>(
               "redispatchSuggestedPower",
               ValueType.NUMBER,
-              new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
               new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
               new MetaItem<>(MetaItemType.READ_ONLY),
               new MetaItem<>(MetaItemType.STORE_DATA_POINTS))
@@ -184,7 +177,6 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
       new AttributeDescriptor<>(
           "redispatchAnnouncementHistory",
           ValueType.JSON_OBJECT,
-          new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 90),
           new MetaItem<>(MetaItemType.READ_ONLY),
           new MetaItem<>(MetaItemType.STORE_DATA_POINTS));
 
@@ -192,7 +184,6 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
       new AttributeDescriptor<>(
           "redispatchBidHistory",
           ValueType.JSON_OBJECT,
-          new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 90),
           new MetaItem<>(MetaItemType.READ_ONLY),
           new MetaItem<>(MetaItemType.STORE_DATA_POINTS));