diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java
index accc13c7..0d26003a 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.java
+++ b/_alp/Agents/EnergyCoop/Code/Functions.java
@@ -1449,15 +1449,29 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 double f_startAfterDeserialisation()
 {/*ALCODESTART::1753348770752*/
 v_liveData = new J_LiveData(this);
-//v_liveConnectionMetaData = new J_ConnectionMetaData(this);
-//v_liveAssetsMetaData = new J_AssetsMetaData(this);
+v_liveData.activeEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+v_liveData.activeProductionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+v_liveData.activeConsumptionEnergyCarriers= EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+
 v_liveData.connectionMetaData = v_liveConnectionMetaData;
 v_liveData.assetsMetaData = v_liveAssetsMetaData;
 
+v_liveData.resetLiveDatasets(energyModel.p_runStartTime_h, energyModel.p_runStartTime_h + 24 * 7, energyModel.p_timeStep_h);
+
+for (GridConnection gc : c_memberGridConnections) {
+	for (OL_EnergyCarriers EC : gc.v_liveData.activeProductionEnergyCarriers) {
+		f_addProductionEnergyCarrier(EC);
+	}
+	for (OL_EnergyCarriers EC : gc.v_liveData.activeConsumptionEnergyCarriers) {
+		f_addConsumptionEnergyCarrier(EC);
+	}
+}
+
 fm_currentProductionFlows_kW = new J_FlowsMap();
 fm_currentConsumptionFlows_kW = new J_FlowsMap();
 fm_currentBalanceFlows_kW = new J_FlowsMap();
 fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
+
 /*ALCODEEND*/}
 
 EnergyCoop f_addConsumptionEnergyCarrier(OL_EnergyCarriers EC)
diff --git a/_alp/Agents/EnergyCoop/Code/Functions.xml b/_alp/Agents/EnergyCoop/Code/Functions.xml
index d827f4ea..a396b4c9 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.xml
+++ b/_alp/Agents/EnergyCoop/Code/Functions.xml
@@ -586,6 +586,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1753348770752</Id>
 		<Name><![CDATA[f_startAfterDeserialisation]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>980</X>
 		<Y>70</Y>
 		<Label>
diff --git a/_alp/Agents/EnergyCoop/Variables.xml b/_alp/Agents/EnergyCoop/Variables.xml
index 522dec8c..6f693474 100644
--- a/_alp/Agents/EnergyCoop/Variables.xml
+++ b/_alp/Agents/EnergyCoop/Variables.xml
@@ -2015,7 +2015,7 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="private" StaticVariable="false">
+		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
 			<CollectionClass>ArrayList</CollectionClass>
 			<ElementClass>GridConnection</ElementClass>
 			<ValueElementClass>Object</ValueElementClass>
diff --git a/_alp/Agents/EnergyModel/AOC.EnergyModel.xml b/_alp/Agents/EnergyModel/AOC.EnergyModel.xml
index 77f9d991..74a45e5b 100644
--- a/_alp/Agents/EnergyModel/AOC.EnergyModel.xml
+++ b/_alp/Agents/EnergyModel/AOC.EnergyModel.xml
@@ -51,7 +51,8 @@ import com.anylogic.engine.markup.GISPoint;
 import com.querydsl.core.types.dsl.TimeExpression;
 //import zero_engine.J_EAStorageElectric;
 //import zero_engine.J_EAConsumption;
-]]></Import>
+
+import com.anylogic.cloud.util.DateUtils;]]></Import>
 	<Implements>I_EnergyData</Implements>
 	<StartupCode><![CDATA[v_liveData = new J_LiveData(this);
 v_liveData.activeEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index 0f6b99f1..e2916c2c 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -460,16 +460,13 @@
 
 double f_runTimestep()
 {/*ALCODESTART::1701162826549*/
-t_h = p_runStartTime_h + v_timeStepsElapsed * p_timeStep_h;// + v_hourOfYearStart);// % 8760;
-
-// Reduce startdate after one year, loop all dat
-if(t_h-p_runStartTime_h!=0.0 && (t_h-p_runStartTime_h) % 8760 == 0.0) {
-	Date startDate = getExperiment().getEngine().getStartDate();
-	startDate.setYear(startDate.getYear()-1);
-	getExperiment().getEngine().setStartDate(startDate);
-	traceln("Reduced anylogic date by one year, looping all data");
+if(t_h-p_runStartTime_h!=0.0 && (t_h-p_runStartTime_h) % (p_runEndTime_h - p_runStartTime_h) == 0.0) {
+	f_loopSimulation();
 }
 
+//Update t_h
+t_h = p_runStartTime_h + v_timeStepsElapsed * p_timeStep_h;
+
 // Update tijdreeksen in leesbare variabelen
 f_updateTimeseries(t_h);
 
@@ -1037,17 +1034,75 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
 
 double f_startAfterDeserialisation()
 {/*ALCODESTART::1753963201170*/
-
+// Reconstruct the LiveData class
 v_liveData = new J_LiveData(this);
-v_liveConnectionMetaData = new J_ConnectionMetaData(this);
-v_liveAssetsMetaData = new J_AssetsMetaData(this);
+v_liveData.activeEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+v_liveData.activeProductionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+v_liveData.activeConsumptionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+
+//v_liveConnectionMetaData = new J_ConnectionMetaData(this);
+//v_liveAssetsMetaData = new J_AssetsMetaData(this);
 v_liveData.connectionMetaData = v_liveConnectionMetaData;
 v_liveData.assetsMetaData = v_liveAssetsMetaData;
 
+v_liveData.resetLiveDatasets(p_runStartTime_h, p_runStartTime_h, p_timeStep_h);
+
 fm_currentProductionFlows_kW = new J_FlowsMap();
 fm_currentConsumptionFlows_kW = new J_FlowsMap();
 fm_currentBalanceFlows_kW = new J_FlowsMap();
 fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
+
+// Reconstruct the LiveData class in the EnergyCoops
+for (EnergyCoop ec : pop_energyCoops) {
+	ec.v_liveData = new J_LiveData(ec);
+	ec.v_liveData.activeEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+	ec.v_liveData.activeProductionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+	ec.v_liveData.activeConsumptionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+	
+	ec.v_liveData.connectionMetaData = ec.v_liveConnectionMetaData;
+	ec.v_liveData.assetsMetaData = ec.v_liveAssetsMetaData;
+
+	ec.v_liveData.resetLiveDatasets(p_runStartTime_h, p_runStartTime_h, p_timeStep_h);
+
+	ec.fm_currentProductionFlows_kW = new J_FlowsMap();
+	ec.fm_currentConsumptionFlows_kW = new J_FlowsMap();
+	ec.fm_currentBalanceFlows_kW = new J_FlowsMap();
+	ec.fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
+}
+
+// Reconstruct the LiveData class in the GridConnections and add EnergyCarriers
+List<GridConnection> allGridConnections = new ArrayList<>(c_gridConnections);
+allGridConnections.addAll(c_pausedGridConnections);
+for (GridConnection gc : allGridConnections) {
+	gc.v_liveData = new J_LiveData(gc);
+	gc.v_liveData.activeEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+	gc.v_liveData.activeProductionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+	gc.v_liveData.activeConsumptionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+	
+	gc.v_liveData.connectionMetaData = gc.v_liveConnectionMetaData;
+	gc.v_liveData.assetsMetaData = gc.v_liveAssetsMetaData;
+	
+	gc.v_liveData.resetLiveDatasets(p_runStartTime_h, p_runStartTime_h, p_timeStep_h);
+	
+	gc.fm_currentProductionFlows_kW = new J_FlowsMap();
+	gc.fm_currentConsumptionFlows_kW = new J_FlowsMap();
+	gc.fm_currentBalanceFlows_kW = new J_FlowsMap();
+	gc.fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
+	
+	for (J_EA j_ea : gc.c_energyAssets) {
+		gc.f_addEnergyCarriersAndAssetCategoriesFromEA(j_ea);
+	}
+}
+
+//v_liveData.activeEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY, OL_EnergyCarriers.HEAT, OL_EnergyCarriers.METHANE, OL_EnergyCarriers.DIESEL);
+//v_liveData.activeProductionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY, OL_EnergyCarriers.HEAT);
+//v_liveData.activeConsumptionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY, OL_EnergyCarriers.HEAT, OL_EnergyCarriers.METHANE, OL_EnergyCarriers.DIESEL);
+//for (J_EA j_ea : c_energyAssets) {
+	//v_liveData.activeProductionEnergyCarriers.addAll(j_ea.activeProductionEnergyCarriers);
+	//v_liveData.activeConsumptionEnergyCarriers.addAll(j_ea.activeConsumptionEnergyCarriers);
+//}
+
+
 /*ALCODEEND*/}
 
 Pair<J_DataSetMap, J_DataSetMap> f_getPeakWeekDataSets()
@@ -1145,3 +1200,33 @@ List<GridConnection> f_getPausedGridConnectionsCollectionPointer()
 }
 /*ALCODEEND*/}
 
+Date f_getDate()
+{/*ALCODESTART::1758012535712*/
+Date startDate = getExperiment().getEngine().getStartDate();
+long startDateUnixTime_ms = startDate.getTime();
+long runtime_ms = (long) (v_timeStepsElapsed * p_timeStep_h * 60 * 60 * 1000);
+Date date = new Date();
+date.setTime(startDateUnixTime_ms + runtime_ms);
+return date;
+/*ALCODEEND*/}
+
+double f_loopSimulation()
+{/*ALCODESTART::1758619562148*/
+v_timeStepsElapsed = 0;
+f_clearAllLiveDatasets();
+traceln("The simulation has been looped.");
+/*ALCODEEND*/}
+
+double f_clearAllLiveDatasets()
+{/*ALCODESTART::1758619851984*/
+//Energy Model
+v_liveData.clearLiveDatasets();
+
+//Energy Coops
+pop_energyCoops.forEach(EC -> EC.v_liveData.clearLiveDatasets());
+
+//GridConnections
+c_gridConnections.forEach(GC -> GC.v_liveData.clearLiveDatasets());
+c_pausedGridConnections.forEach(GC -> GC.v_liveData.clearLiveDatasets());
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/EnergyModel/Code/Functions.xml b/_alp/Agents/EnergyModel/Code/Functions.xml
index a015d1ce..e3d954d9 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.xml
+++ b/_alp/Agents/EnergyModel/Code/Functions.xml
@@ -242,7 +242,7 @@
 		<Id>1716890117265</Id>
 		<Name><![CDATA[f_getActiveGridConnections]]></Name>
 		<X>1640</X>
-		<Y>370</Y>
+		<Y>500</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -274,7 +274,7 @@
 		<Id>1716897568717</Id>
 		<Name><![CDATA[f_getConnectionOwners]]></Name>
 		<X>1640</X>
-		<Y>410</Y>
+		<Y>540</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -290,7 +290,7 @@
 		<Id>1716899946694</Id>
 		<Name><![CDATA[f_getTopLevelGridCapacity_kW]]></Name>
 		<X>1640</X>
-		<Y>430</Y>
+		<Y>560</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -306,7 +306,7 @@
 		<Id>1717058801652</Id>
 		<Name><![CDATA[f_getEnergyAssets]]></Name>
 		<X>1640</X>
-		<Y>450</Y>
+		<Y>580</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -322,7 +322,7 @@
 		<Id>1718289616227</Id>
 		<Name><![CDATA[f_getGridNodesTopLevel]]></Name>
 		<X>1640</X>
-		<Y>500</Y>
+		<Y>620</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -338,7 +338,7 @@
 		<Id>1718289761647</Id>
 		<Name><![CDATA[f_getGridNodesNotTopLevel]]></Name>
 		<X>1640</X>
-		<Y>520</Y>
+		<Y>640</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -408,7 +408,7 @@
 		<Id>1727167397666</Id>
 		<Name><![CDATA[f_getPausedGridConnections]]></Name>
 		<X>1640</X>
-		<Y>390</Y>
+		<Y>520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -476,7 +476,7 @@
 		<Id>1739958854535</Id>
 		<Name><![CDATA[f_addEnergyCoop]]></Name>
 		<X>1640</X>
-		<Y>180</Y>
+		<Y>280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -496,7 +496,7 @@
 		<Id>1739972940581</Id>
 		<Name><![CDATA[f_removeEnergyCoop]]></Name>
 		<X>1640</X>
-		<Y>200</Y>
+		<Y>300</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -516,7 +516,7 @@
 		<Id>1740056275008</Id>
 		<Name><![CDATA[f_addConsumptionEnergyCarrier]]></Name>
 		<X>1640</X>
-		<Y>240</Y>
+		<Y>340</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -536,7 +536,7 @@
 		<Id>1741710906926</Id>
 		<Name><![CDATA[f_updateActiveAssetsMetaData]]></Name>
 		<X>1640</X>
-		<Y>80</Y>
+		<Y>180</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -552,7 +552,7 @@
 		<Id>1746021439807</Id>
 		<Name><![CDATA[f_addProductionEnergyCarrier]]></Name>
 		<X>1640</X>
-		<Y>260</Y>
+		<Y>360</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -636,7 +636,7 @@
 		<Id>1754379679149</Id>
 		<Name><![CDATA[f_addAssetFlow]]></Name>
 		<X>1640</X>
-		<Y>280</Y>
+		<Y>380</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -656,7 +656,7 @@
 		<Id>1754908171225</Id>
 		<Name><![CDATA[f_getGridConnectionsCollectionPointer]]></Name>
 		<X>1640</X>
-		<Y>560</Y>
+		<Y>680</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -672,7 +672,7 @@
 		<Id>1755014169405</Id>
 		<Name><![CDATA[f_getPausedGridConnectionsCollectionPointer]]></Name>
 		<X>1640</X>
-		<Y>580</Y>
+		<Y>700</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -698,4 +698,52 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>Date</ReturnType>
+		<Id>1758012535712</Id>
+		<Name><![CDATA[f_getDate]]></Name>
+		<X>1640</X>
+		<Y>470</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1758619562148</Id>
+		<Name><![CDATA[f_loopSimulation]]></Name>
+		<X>1640</X>
+		<Y>70</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1758619851984</Id>
+		<Name><![CDATA[f_clearAllLiveDatasets]]></Name>
+		<X>1660</X>
+		<Y>90</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/EnergyModel/EmbeddedObjects.xml b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
index 998000a3..bee9a906 100644
--- a/_alp/Agents/EnergyModel/EmbeddedObjects.xml
+++ b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
@@ -232,6 +232,9 @@
 			<Parameter>
 				<Name><![CDATA[p_chargingManagement]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_uid]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -1029,6 +1032,9 @@
 			<Parameter>
 				<Name><![CDATA[p_chargingManagement]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_uid]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -1179,6 +1185,9 @@
 			<Parameter>
 				<Name><![CDATA[p_chargingManagement]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_uid]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -1323,6 +1332,9 @@
 			<Parameter>
 				<Name><![CDATA[p_chargingManagement]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_uid]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -1527,6 +1539,9 @@
 			<Parameter>
 				<Name><![CDATA[p_chargingManagement]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_uid]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -1668,6 +1683,9 @@
 			<Parameter>
 				<Name><![CDATA[p_chargingManagement]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_uid]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -1812,6 +1830,9 @@
 			<Parameter>
 				<Name><![CDATA[p_chargingManagement]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_uid]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -2334,6 +2355,9 @@
 			<Parameter>
 				<Name><![CDATA[p_chargingManagement]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_uid]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -2515,6 +2539,9 @@
 			<Parameter>
 				<Name><![CDATA[p_chargingManagement]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_uid]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
diff --git a/_alp/Agents/EnergyModel/Levels/Level.level.xml b/_alp/Agents/EnergyModel/Levels/Level.level.xml
index 3070e549..45a8eb24 100644
--- a/_alp/Agents/EnergyModel/Levels/Level.level.xml
+++ b/_alp/Agents/EnergyModel/Levels/Level.level.xml
@@ -607,7 +607,7 @@
 		<Id>1716890105093</Id>
 		<Name><![CDATA[line10]]></Name>
 		<X>1620</X>
-		<Y>350</Y>
+		<Y>450</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -635,7 +635,7 @@
 		<Id>1716890105095</Id>
 		<Name><![CDATA[text12]]></Name>
 		<X>1710</X>
-		<Y>330</Y>
+		<Y>430</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -688,7 +688,7 @@
 		<Id>1739958834681</Id>
 		<Name><![CDATA[line11]]></Name>
 		<X>1620</X>
-		<Y>160</Y>
+		<Y>260</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -716,7 +716,7 @@
 		<Id>1739958834683</Id>
 		<Name><![CDATA[text14]]></Name>
 		<X>1710</X>
-		<Y>140</Y>
+		<Y>240</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -845,7 +845,7 @@ energyDataViewer.viewArea.navigateTo();</ActionCode>
 		<Id>1753353340150</Id>
 		<Name><![CDATA[txt_updateFunctions]]></Name>
 		<X>1710</X>
-		<Y>40</Y>
+		<Y>140</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -870,7 +870,7 @@ energyDataViewer.viewArea.navigateTo();</ActionCode>
 		<Id>1753353355569</Id>
 		<Name><![CDATA[line_updateFunctions]]></Name>
 		<X>1620</X>
-		<Y>60</Y>
+		<Y>160</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1313,4 +1313,57 @@ energyDataViewer.viewArea.navigateTo();</ActionCode>
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
+	<Text>
+		<Id>1758620074679</Id>
+		<Name><![CDATA[txt_loopSimulationFunctionality]]></Name>
+		<X>1720</X>
+		<Y>30</Y>
+		<Label>
+			<X>0</X>
+			<Y>-10</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D</DrawMode>
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Z>0</Z>
+		<Rotation>0.0</Rotation>
+		<Color>-16777216</Color>
+		<Text><![CDATA[Loop simulation functionality]]></Text>
+		<Font>
+			<Name><![CDATA[SansSerif]]></Name>
+			<Size>11</Size>
+			<Style>0</Style>
+		</Font>
+		<Alignment>CENTER</Alignment>
+	</Text>
+	<Line>
+		<Id>1758620074681</Id>
+		<Name><![CDATA[line_updateFunctions1]]></Name>
+		<X>1630</X>
+		<Y>50</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Z>0</Z>
+		<ZHeight>10</ZHeight>
+		<LineWidth>1</LineWidth>
+		<LineColor>-16777216</LineColor>
+		<LineMaterial>null</LineMaterial>
+		<LineStyle>SOLID</LineStyle>
+		<BeginArrowSize>1</BeginArrowSize>
+		<BeginArrowStyle>0</BeginArrowStyle>
+		<EndArrowSize>1</EndArrowSize>
+		<EndArrowStyle>0</EndArrowStyle>
+		<Dx>190</Dx>
+		<Dy>0</Dy>
+		<Dz>0</Dz>
+	</Line>
 </Presentation>
diff --git a/_alp/Agents/EnergyModel/Variables.xml b/_alp/Agents/EnergyModel/Variables.xml
index 9eb7a0ed..3ea5f228 100644
--- a/_alp/Agents/EnergyModel/Variables.xml
+++ b/_alp/Agents/EnergyModel/Variables.xml
@@ -997,6 +997,9 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[double]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[0]]></Code>
+			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
diff --git a/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml b/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
index 959a98b2..c517a9c5 100644
--- a/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
+++ b/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
@@ -93,6 +93,9 @@
 		<Parameter>
 			<Name><![CDATA[p_chargingManagement]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_uid]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml b/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
index 0c77b79b..2c0c27f2 100644
--- a/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
+++ b/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
@@ -94,6 +94,9 @@
 		<Parameter>
 			<Name><![CDATA[p_chargingManagement]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_uid]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml b/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
index 365f45aa..bc646910 100644
--- a/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
+++ b/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
@@ -93,6 +93,9 @@
 		<Parameter>
 			<Name><![CDATA[p_chargingManagement]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_uid]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml b/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
index cb1ef033..4f6ec992 100644
--- a/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
+++ b/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
@@ -93,6 +93,9 @@
 		<Parameter>
 			<Name><![CDATA[p_chargingManagement]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_uid]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCHouse/AOC.GCHouse.xml b/_alp/Agents/GCHouse/AOC.GCHouse.xml
index a0432ba7..314883b5 100644
--- a/_alp/Agents/GCHouse/AOC.GCHouse.xml
+++ b/_alp/Agents/GCHouse/AOC.GCHouse.xml
@@ -93,6 +93,9 @@
 		<Parameter>
 			<Name><![CDATA[p_chargingManagement]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_uid]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCIndustry/AOC.GCIndustry.xml b/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
index 9c677d47..2d802b28 100644
--- a/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
+++ b/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
@@ -94,6 +94,9 @@
 		<Parameter>
 			<Name><![CDATA[p_chargingManagement]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_uid]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml b/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
index 7f1457ec..a831a8a3 100644
--- a/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
+++ b/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
@@ -93,6 +93,9 @@
 		<Parameter>
 			<Name><![CDATA[p_chargingManagement]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_uid]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml b/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
index 257fe5c5..ef23f04f 100644
--- a/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
+++ b/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
@@ -93,6 +93,9 @@
 		<Parameter>
 			<Name><![CDATA[p_chargingManagement]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_uid]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCUtility/AOC.GCUtility.xml b/_alp/Agents/GCUtility/AOC.GCUtility.xml
index bf38a8eb..d20ac88a 100644
--- a/_alp/Agents/GCUtility/AOC.GCUtility.xml
+++ b/_alp/Agents/GCUtility/AOC.GCUtility.xml
@@ -93,6 +93,9 @@
 		<Parameter>
 			<Name><![CDATA[p_chargingManagement]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_uid]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GIS_Object/AOC.GIS_Object.xml b/_alp/Agents/GIS_Object/AOC.GIS_Object.xml
index ec08a798..9e55691a 100644
--- a/_alp/Agents/GIS_Object/AOC.GIS_Object.xml
+++ b/_alp/Agents/GIS_Object/AOC.GIS_Object.xml
@@ -10,16 +10,18 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 @JsonTypeInfo(
-	    use = JsonTypeInfo.Id.NAME,
+	    use = JsonTypeInfo.Id.CLASS,
 	    include = JsonTypeInfo.As.PROPERTY,
 	    property = "type"  // 👈 this will be the field name in your JSON
 	)
+/*
 @JsonSubTypes({
     @JsonSubTypes.Type(value = GIS_Building.class, name = "GIS_Building"),
     @JsonSubTypes.Type(value = GIS_Parcel.class, name = "GIS_Parcel"),
    
     // Add other known subtypes here if needed
 })
+*/
 
 @JsonIgnoreProperties({"va_building", "va_parcel", "_origin_VA","gisRegion",
 	"p_defaultFillColor", "p_defaultLineColor", "p_defaultLineStyle"})]]></Import>
diff --git a/_alp/Agents/GridConnection/AOC.GridConnection.xml b/_alp/Agents/GridConnection/AOC.GridConnection.xml
index 27a817ac..c8686986 100644
--- a/_alp/Agents/GridConnection/AOC.GridConnection.xml
+++ b/_alp/Agents/GridConnection/AOC.GridConnection.xml
@@ -30,10 +30,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 @JsonTypeInfo(
-	    use = JsonTypeInfo.Id.NAME,
+	    use = JsonTypeInfo.Id.CLASS,
 	    include = JsonTypeInfo.As.PROPERTY,
 	    property = "type"  // 👈 this will be the field name in your JSON
 	)
+/*
 @JsonSubTypes({
     @JsonSubTypes.Type(value = GCDistrictHeating.class, name = "GCDistrictHeating"),
     @JsonSubTypes.Type(value = GCEnergyConversion.class, name = "GCEnergyConversion"),
@@ -48,6 +49,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
     
     // Add other known subtypes here if needed
 })
+*/
 
 @JsonIgnoreProperties({"va_gridConnection","_origin_VA","_pl_powerFlows_autoUpdateEvent_xjal","_SOC_plot_autoUpdateEvent_xjal"})
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")]]></Import>
diff --git a/_alp/Agents/GridConnection/Code/AdditionalClassCode.java b/_alp/Agents/GridConnection/Code/AdditionalClassCode.java
index 5f7633a5..4369e95d 100644
--- a/_alp/Agents/GridConnection/Code/AdditionalClassCode.java
+++ b/_alp/Agents/GridConnection/Code/AdditionalClassCode.java
@@ -1,3 +1,5 @@
+public final String p_uid = UUID.randomUUID().toString();
+
 public OL_ResultScope getScope(){return OL_ResultScope.GRIDCONNECTION;}
 public J_RapidRunData getRapidRunData(){return v_rapidRunData;}
 public J_LiveData getLiveData(){return v_liveData;}
@@ -16,4 +18,5 @@ public static void forceSetOwner(Agent agent, AgentArrayList pop) throws Excepti
     traceln("Field c: %s", c);
     c.setAccessible(true);
     c.toString();*/
-}
\ No newline at end of file
+}
+
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index 80ac80ea..7c8bb19d 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -424,41 +424,7 @@
 
 double f_connectToJ_EA_default(J_EA j_ea)
 {/*ALCODESTART::1692799608559*/
-for (OL_EnergyCarriers EC : j_ea.getActiveConsumptionEnergyCarriers()) {
-	if (!v_liveData.activeConsumptionEnergyCarriers.contains(EC)) {
-		v_liveData.activeConsumptionEnergyCarriers.add(EC);
-		v_liveData.activeEnergyCarriers.add(EC);
-		if (energyModel.b_isInitialized && v_isActive) {
-			f_addConsumptionEnergyCarrier(EC);	
-			//Add EC to energyModel
-			energyModel.f_addConsumptionEnergyCarrier(EC);
-			c_parentCoops.forEach(x -> x.f_addConsumptionEnergyCarrier(EC));
-		}
-	}
-}
-
-for (OL_EnergyCarriers EC : j_ea.getActiveProductionEnergyCarriers()) {
-	if (!v_liveData.activeProductionEnergyCarriers.contains(EC)) {
-		v_liveData.activeProductionEnergyCarriers.add(EC);
-		v_liveData.activeEnergyCarriers.add(EC);
-		if (energyModel.b_isInitialized && v_isActive) {		
-			f_addProductionEnergyCarrier(EC);
-			//Add EC to energyModel
-			energyModel.f_addProductionEnergyCarrier(EC);
-			c_parentCoops.forEach(x -> x.f_addProductionEnergyCarrier(EC));			
-		}
-	}
-}
-
-if(j_ea.assetFlowCategory != null &&!v_liveAssetsMetaData.activeAssetFlows.contains(j_ea.assetFlowCategory)) { // add live dataset
-	OL_AssetFlowCategories AC = j_ea.assetFlowCategory;
-	if (energyModel.b_isInitialized && v_isActive) {	
-		f_addAssetFlow(AC);	
-	}
-	else{
-		v_liveAssetsMetaData.activeAssetFlows.add(AC);
-	}
-}
+f_addEnergyCarriersAndAssetCategoriesFromEA(j_ea);
 
 energyModel.c_energyAssets.add(j_ea);
 c_energyAssets.add(j_ea);
@@ -1236,11 +1202,21 @@ else if (flowsMap.get(EC) > 0){
 double f_startAfterDeserialisation()
 {/*ALCODESTART::1753348699140*/
 v_liveData = new J_LiveData(this);
+v_liveData.activeEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+v_liveData.activeProductionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+v_liveData.activeConsumptionEnergyCarriers= EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
+
 //v_liveConnectionMetaData = new J_ConnectionMetaData(this);
 //v_liveAssetsMetaData = new J_AssetsMetaData(this);
 v_liveData.connectionMetaData = v_liveConnectionMetaData;
 v_liveData.assetsMetaData = v_liveAssetsMetaData;
 
+v_liveData.resetLiveDatasets(energyModel.p_runStartTime_h, energyModel.p_runStartTime_h + 24 * 7, energyModel.p_timeStep_h);
+
+for (J_EA j_ea : c_energyAssets) {
+	f_addEnergyCarriersAndAssetCategoriesFromEA(j_ea);
+}
+
 fm_currentProductionFlows_kW = new J_FlowsMap();
 fm_currentConsumptionFlows_kW = new J_FlowsMap();
 fm_currentBalanceFlows_kW = new J_FlowsMap();
@@ -1436,3 +1412,42 @@ EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC)
 
 /*ALCODEEND*/}
 
+double f_addEnergyCarriersAndAssetCategoriesFromEA(J_EA j_ea)
+{/*ALCODESTART::1756977865503*/
+for (OL_EnergyCarriers EC : j_ea.getActiveConsumptionEnergyCarriers()) {
+	if (!v_liveData.activeConsumptionEnergyCarriers.contains(EC)) {
+		v_liveData.activeConsumptionEnergyCarriers.add(EC);
+		v_liveData.activeEnergyCarriers.add(EC);
+		if (energyModel.b_isInitialized && v_isActive) {
+			f_addConsumptionEnergyCarrier(EC);	
+			//Add EC to energyModel
+			energyModel.f_addConsumptionEnergyCarrier(EC);
+			c_parentCoops.forEach(x -> x.f_addConsumptionEnergyCarrier(EC));
+		}
+	}
+}
+
+for (OL_EnergyCarriers EC : j_ea.getActiveProductionEnergyCarriers()) {
+	if (!v_liveData.activeProductionEnergyCarriers.contains(EC)) {
+		v_liveData.activeProductionEnergyCarriers.add(EC);
+		v_liveData.activeEnergyCarriers.add(EC);
+		if (energyModel.b_isInitialized && v_isActive) {		
+			f_addProductionEnergyCarrier(EC);
+			//Add EC to energyModel
+			energyModel.f_addProductionEnergyCarrier(EC);
+			c_parentCoops.forEach(x -> x.f_addProductionEnergyCarrier(EC));			
+		}
+	}
+}
+
+if(j_ea.assetFlowCategory != null &&!v_liveAssetsMetaData.activeAssetFlows.contains(j_ea.assetFlowCategory)) { // add live dataset
+	OL_AssetFlowCategories AC = j_ea.assetFlowCategory;
+	if (energyModel.b_isInitialized && v_isActive) {	
+		f_addAssetFlow(AC);	
+	}
+	else{
+		v_liveAssetsMetaData.activeAssetFlows.add(AC);
+	}
+}
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/GridConnection/Code/Functions.xml b/_alp/Agents/GridConnection/Code/Functions.xml
index cb2c9efd..a44aa446 100644
--- a/_alp/Agents/GridConnection/Code/Functions.xml
+++ b/_alp/Agents/GridConnection/Code/Functions.xml
@@ -639,6 +639,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1753348699140</Id>
 		<Name><![CDATA[f_startAfterDeserialisation]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1030</X>
 		<Y>50</Y>
 		<Label>
@@ -812,4 +813,24 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1756977865503</Id>
+		<Name><![CDATA[f_addEnergyCarriersAndAssetCategoriesFromEA]]></Name>
+		<X>1310</X>
+		<Y>40</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[j_ea]]></Name>
+			<Type><![CDATA[J_EA]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/GridConnection/Variables.xml b/_alp/Agents/GridConnection/Variables.xml
index 91acb666..f8a4edab 100644
--- a/_alp/Agents/GridConnection/Variables.xml
+++ b/_alp/Agents/GridConnection/Variables.xml
@@ -1271,6 +1271,32 @@
 			</ParameterEditor>
 		</Properties>
 	</Variable>
+	<Variable Class="Parameter">
+		<Id>1757330831065</Id>
+		<Name><![CDATA[p_uid]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>50</X>
+		<Y>100</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[String]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1757330831063</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
 	<Variable Class="CollectionVariable">
 		<Id>1659962626903</Id>
 		<Name><![CDATA[c_energyAssets]]></Name>
diff --git a/_alp/Classes/Class.ActorMixin.java b/_alp/Classes/Class.ActorMixin.java
index fa798be2..bde6b49b 100644
--- a/_alp/Classes/Class.ActorMixin.java
+++ b/_alp/Classes/Class.ActorMixin.java
@@ -12,10 +12,11 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 @JsonTypeInfo(
-	    use = JsonTypeInfo.Id.NAME,
+	    use = JsonTypeInfo.Id.CLASS,
 	    include = JsonTypeInfo.As.PROPERTY,
 	    property = "type"  // 👈 this will be the field name in your JSON
 	)
+/*
 @JsonSubTypes({
     @JsonSubTypes.Type(value = ConnectionOwner.class, name = "ConnectionOwner"),
     @JsonSubTypes.Type(value = EnergyCoop.class, name = "EnergyCoop"),
@@ -32,6 +33,8 @@
     
     // Add other known subtypes here if needed
 })
+*/
+
 public abstract class ActorMixin implements Serializable {
 		
     	/*@JsonIgnore
diff --git a/_alp/Classes/Class.AgentMixin.java b/_alp/Classes/Class.AgentMixin.java
index 91ce701e..477319cf 100644
--- a/_alp/Classes/Class.AgentMixin.java
+++ b/_alp/Classes/Class.AgentMixin.java
@@ -11,10 +11,11 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 @JsonTypeInfo(
-	    use = JsonTypeInfo.Id.NAME,
+	    use = JsonTypeInfo.Id.CLASS,
 	    include = JsonTypeInfo.As.PROPERTY,
 	    property = "type"  // 👈 this will be the field name in your JSON
 	)
+/*
 @JsonSubTypes({ // Needed because parentAgent in J_EA is of type Agent, and paused gridConnections are first serialized via their energy assets, leading to type ambigueity
     @JsonSubTypes.Type(value = Actor.class, name = "Actor"),
     @JsonSubTypes.Type(value = GridConnection.class, name = "GridConnection"),
@@ -31,6 +32,8 @@
     
     // Add other known subtypes here if needed
 })
+*/
+
 @JsonAutoDetect(
     fieldVisibility = Visibility.PUBLIC_ONLY,    // ✅ only public fields are serialized
     getterVisibility = Visibility.NONE,
diff --git a/_alp/Classes/Class.I_AggregatorBatteryManagement.java b/_alp/Classes/Class.I_AggregatorBatteryManagement.java
index 081abbea..c90728fc 100644
--- a/_alp/Classes/Class.I_AggregatorBatteryManagement.java
+++ b/_alp/Classes/Class.I_AggregatorBatteryManagement.java
@@ -5,16 +5,18 @@
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 
 @JsonTypeInfo(
-	    use = JsonTypeInfo.Id.NAME,
+	    use = JsonTypeInfo.Id.CLASS,
 	    include = JsonTypeInfo.As.PROPERTY,
 	    property = "type"  // 👈 this will be the field name in your JSON 👈
 	)
+/*
 @JsonSubTypes({
     @JsonSubTypes.Type(value = J_AggregatorBatteryManagementOff.class, name = "J_AggregatorBatteryManagementOff"),
     @JsonSubTypes.Type(value = J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.class, name = "J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize"),
     @JsonSubTypes.Type(value = J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.class, name = "J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate"),
     @JsonSubTypes.Type(value = J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.class, name = "J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH"),
 })
+*/
 
 /**
  * I_AggregatorBatteryManagement
diff --git a/_alp/Classes/Class.I_BatteryManagement.java b/_alp/Classes/Class.I_BatteryManagement.java
index 5550c05f..6ad14183 100644
--- a/_alp/Classes/Class.I_BatteryManagement.java
+++ b/_alp/Classes/Class.I_BatteryManagement.java
@@ -5,10 +5,11 @@
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 
 @JsonTypeInfo(
-	    use = JsonTypeInfo.Id.NAME,
+	    use = JsonTypeInfo.Id.CLASS,
 	    include = JsonTypeInfo.As.PROPERTY,
 	    property = "type"  // 👈 this will be the field name in your JSON
 	)
+/*
 @JsonSubTypes({
     @JsonSubTypes.Type(value = J_BatteryManagementOff.class, name = "J_BatteryManagementOff"),
     @JsonSubTypes.Type(value = J_BatteryManagementPeakShaving.class, name = "J_BatteryManagementPeakShaving"),
@@ -18,7 +19,8 @@
     @JsonSubTypes.Type(value = J_BatteryManagementSelfConsumptionGridNode.class, name = "J_BatteryManagementSelfConsumptionGridNode"),
     @JsonSubTypes.Type(value = J_BatteryManagementExternalSetpoint.class, name = "J_BatteryManagementExternalSetpoint"),
 })
-    
+*/
+
     // Add other known subtypes here if needed
 
 public interface I_BatteryManagement
diff --git a/_alp/Classes/Class.I_ChargingManagement.java b/_alp/Classes/Class.I_ChargingManagement.java
index e902a257..4a97f39c 100644
--- a/_alp/Classes/Class.I_ChargingManagement.java
+++ b/_alp/Classes/Class.I_ChargingManagement.java
@@ -17,8 +17,9 @@
     @JsonSubTypes.Type(value = J_ChargingManagementMaxAvailablePower.class, name = "J_ChargingManagementMaxAvailablePower"),
     @JsonSubTypes.Type(value = J_ChargingManagementPrice.class, name = "J_ChargingManagementPrice"),
     @JsonSubTypes.Type(value = J_ChargingManagementSimple.class, name = "J_ChargingManagementSimple"),
-})*/
-    
+})
+*/
+
 public interface I_ChargingManagement
 {
 	void manageCharging();
diff --git a/_alp/Classes/Class.I_HeatingManagement.java b/_alp/Classes/Class.I_HeatingManagement.java
index 7ee6f197..2e8402e5 100644
--- a/_alp/Classes/Class.I_HeatingManagement.java
+++ b/_alp/Classes/Class.I_HeatingManagement.java
@@ -2,8 +2,11 @@
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "type")
+/*
 @JsonTypeInfo(
 	    use = JsonTypeInfo.Id.NAME,
 	    include = JsonTypeInfo.As.PROPERTY,
@@ -21,7 +24,7 @@
     @JsonSubTypes.Type(value = J_HeatingManagementProfileWithPTBufferSimple.class, name = "J_HeatingManagementProfileWithPTBufferSimple"),
     @JsonSubTypes.Type(value = J_HeatingManagementSimple.class, name = "J_HeatingManagementSimple"),
 })
-
+*/
 public interface I_HeatingManagement {
 	void manageHeating();
 	// Initiliaze throws an exception when the configuration of assets is not a valid combination
diff --git a/_alp/Classes/Class.J_Contract.java b/_alp/Classes/Class.J_Contract.java
index 06107d0a..5b7f2091 100644
--- a/_alp/Classes/Class.J_Contract.java
+++ b/_alp/Classes/Class.J_Contract.java
@@ -2,16 +2,18 @@
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 
 @JsonTypeInfo(
-	    use = JsonTypeInfo.Id.NAME,
+	    use = JsonTypeInfo.Id.CLASS,
 	    include = JsonTypeInfo.As.PROPERTY,
 	    property = "type"  // 👈 this will be the field name in your JSON
 	)
+/*
 @JsonSubTypes({
     @JsonSubTypes.Type(value = J_DeliveryContract.class, name = "J_DeliveryContract"),
     @JsonSubTypes.Type(value = J_ConnectionContract.class, name = "J_ConnectionContract"),
     @JsonSubTypes.Type(value = J_TransportContract.class, name = "J_TransportContract"),
     @JsonSubTypes.Type(value = J_TaxContract.class, name = "J_TaxContract"),
 })
+*/
 
 public class J_Contract implements Serializable {
 
diff --git a/_alp/Classes/Class.J_EA.java b/_alp/Classes/Class.J_EA.java
index 142f5a82..8facd25f 100644
--- a/_alp/Classes/Class.J_EA.java
+++ b/_alp/Classes/Class.J_EA.java
@@ -20,7 +20,12 @@
     setterVisibility = Visibility.NONE,
     creatorVisibility = Visibility.NONE
 )
-
+@JsonTypeInfo(
+		use = JsonTypeInfo.Id.CLASS,
+		include = JsonTypeInfo.As.PROPERTY,
+		property = "type"
+	)
+/*
 @JsonTypeInfo(
 	    use = JsonTypeInfo.Id.NAME,
 	    include = JsonTypeInfo.As.PROPERTY,
@@ -39,11 +44,12 @@
     @JsonSubTypes.Type(value = J_EAConversionHeatPump.class, name = "J_EAConversionHeatPump"),
     @JsonSubTypes.Type(value = J_EAEV.class, name = "J_EAEV"),
     @JsonSubTypes.Type(value = J_EADieselVehicle.class, name = "J_EADieselVehicle"),
+    @JsonSubTypes.Type(value = J_EAHydrogenVehicle.class, name = "J_EAHydrogenVehicle"),
     @JsonSubTypes.Type(value = J_EAConversionHeatDeliverySet.class, name = "J_EAConversionHeatDeliverySet"),
     
-    
     // Add other known subtypes here if needed
 })
+*/
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 abstract public class J_EA implements Cloneable {
 	
diff --git a/_alp/Classes/Class.J_LiveData.java b/_alp/Classes/Class.J_LiveData.java
index f0c5a7ab..8e89210e 100644
--- a/_alp/Classes/Class.J_LiveData.java
+++ b/_alp/Classes/Class.J_LiveData.java
@@ -32,11 +32,36 @@ public class J_LiveData {
     public J_LiveData(Agent parentAgent) {
     	this.parentAgent = parentAgent;
     }
-	
+
+    public void clearLiveDatasets() {
+    	for(OL_EnergyCarriers EC : activeConsumptionEnergyCarriers){
+    		dsm_liveDemand_kW.get(EC).reset();
+    	}
+    	
+    	for(OL_EnergyCarriers EC : activeProductionEnergyCarriers){
+    		dsm_liveSupply_kW.get(EC).reset();
+    	}
+    	
+    	for (OL_AssetFlowCategories AC : assetsMetaData.activeAssetFlows) { // First add missing assetFlow datasets if there are any
+			dsm_liveAssetFlows_kW.get(AC).reset();
+    	}
+
+    	data_totalDemand_kW.reset();
+    	data_totalSupply_kW.reset();
+    	data_liveElectricityBalance_kW.reset();
+    	data_gridCapacityDemand_kW.reset();
+    	data_gridCapacitySupply_kW.reset();
+
+
+    	data_batteryStoredEnergyLiveWeek_MWh.reset();
+    	data_batterySOC_fr.reset();
+    	
+    }
+    
     public void resetLiveDatasets(double startTime, double endTime, double timeStep_h) {
     	for(OL_EnergyCarriers EC : activeConsumptionEnergyCarriers){
     		DataSet dsDemand = new DataSet( (int)(168 / timeStep_h) );
-    		for (double t = startTime; t <= endTime; t += timeStep_h) {
+    		for (double t = startTime; t < endTime; t += timeStep_h) {
     			dsDemand.add( t, 0);
     		}
     		dsm_liveDemand_kW.put( EC, dsDemand);
@@ -44,7 +69,7 @@ public void resetLiveDatasets(double startTime, double endTime, double timeStep_
     	
     	for(OL_EnergyCarriers EC : activeProductionEnergyCarriers){
     		DataSet dsSupply = new DataSet( (int)(168 / timeStep_h) );
-    		for (double t = startTime; t <= endTime; t += timeStep_h) {
+    		for (double t = startTime; t < endTime; t += timeStep_h) {
     			dsSupply.add( t, 0);
     		}
     		dsm_liveSupply_kW.put( EC, dsSupply);
@@ -57,7 +82,7 @@ public void resetLiveDatasets(double startTime, double endTime, double timeStep_
 			}
     	}
     	
-		for (double t = startTime; t <= endTime; t += timeStep_h) {
+		for (double t = startTime; t < endTime; t += timeStep_h) {
 			
 			for (OL_AssetFlowCategories AC : assetsMetaData.activeAssetFlows) {
 				dsm_liveAssetFlows_kW.get(AC).add(t, 0);
diff --git a/_alp/Classes/Class.J_ValueMap.java b/_alp/Classes/Class.J_ValueMap.java
index a5735c3e..03c2856c 100644
--- a/_alp/Classes/Class.J_ValueMap.java
+++ b/_alp/Classes/Class.J_ValueMap.java
@@ -1,4 +1,4 @@
-	/**
+/**
  * J_ValueMap
  */	
 import zeroPackage.ZeroMath;