From 332b538538f081e35766a8795923c6f9bf843ae4 Mon Sep 17 00:00:00 2001
From: GillisHommen <gillis@zenmo.com>
Date: Tue, 27 Jan 2026 16:05:10 +0100
Subject: [PATCH 1/3] Added annotations to new classes to fix serialisation.

---
 _alp/Agents/EnergyModel/Code/Functions.java       |  7 ++++++-
 _alp/Classes/Class.I_ChargePointRegistration.java | 13 +++++++++++++
 _alp/Classes/Class.I_ChargingRequest.java         | 13 +++++++++++++
 _alp/Classes/Class.J_ChargePoint.java             | 15 +++++++++++++++
 .../Class.J_ChargingManagementGridBalancing.java  |  3 +++
 .../Class.J_ChargingManagementLocalBalancing.java |  3 +++
 ...ass.J_ChargingManagementMaxAvailablePower.java |  4 ++++
 .../Class.J_ChargingManagementOffPeak.java        |  3 +++
 _alp/Classes/Class.J_ChargingManagementPrice.java |  3 +++
 .../Classes/Class.J_ChargingManagementSimple.java |  4 ++++
 _alp/Classes/Class.J_TimeParameters.java          |  2 ++
 _alp/Classes/Class.J_TimeVariables.java           |  2 ++
 12 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index 3c814ea..b751a32 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -1041,6 +1041,8 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
 fm_currentConsumptionFlows_kW = new J_FlowsMap();
 fm_currentBalanceFlows_kW = new J_FlowsMap();
 fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
+fm_heatFromEnergyCarrier_kW = new J_FlowsMap();
+fm_consumptionForHeating_kW = new J_FlowsMap();
 
 // Reconstruct the LiveData class in the EnergyCoops
 for (EnergyCoop ec : pop_energyCoops) {
@@ -1058,6 +1060,8 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
 	ec.fm_currentConsumptionFlows_kW = new J_FlowsMap();
 	ec.fm_currentBalanceFlows_kW = new J_FlowsMap();
 	ec.fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
+	ec.fm_heatFromEnergyCarrier_kW = new J_FlowsMap();
+	ec.fm_consumptionForHeating_kW = new J_FlowsMap();
 }
 
 // Reconstruct the LiveData class in the GridConnections and add EnergyCarriers
@@ -1078,7 +1082,8 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
 	gc.fm_currentConsumptionFlows_kW = new J_FlowsMap();
 	gc.fm_currentBalanceFlows_kW = new J_FlowsMap();
 	gc.fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
-	
+	gc.fm_heatFromEnergyCarrier_kW = new J_FlowsMap();
+	gc.fm_consumptionForHeating_kW = new J_FlowsMap();
 	/*for (J_EA j_ea : gc.c_energyAssets) {
 		gc.f_addEnergyCarriersAndAssetCategoriesFromEA(j_ea);
 	}*/
diff --git a/_alp/Classes/Class.I_ChargePointRegistration.java b/_alp/Classes/Class.I_ChargePointRegistration.java
index 89fa6be..d6e3bba 100644
--- a/_alp/Classes/Class.I_ChargePointRegistration.java
+++ b/_alp/Classes/Class.I_ChargePointRegistration.java
@@ -1,3 +1,16 @@
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+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"  // 👈 this will be the field name in your JSON
+	)
+
+
 public interface I_ChargePointRegistration
 {
 	public void registerChargingRequest(I_ChargingRequest chargingRequest);
diff --git a/_alp/Classes/Class.I_ChargingRequest.java b/_alp/Classes/Class.I_ChargingRequest.java
index 6e4243e..45d2503 100644
--- a/_alp/Classes/Class.I_ChargingRequest.java
+++ b/_alp/Classes/Class.I_ChargingRequest.java
@@ -1,6 +1,19 @@
 /**
  * I_ChargingRequest
  */	
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+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"  // 👈 this will be the field name in your JSON
+	)
+
+
 public interface I_ChargingRequest {
 	
 	// The maximal capacity for the vehicle
diff --git a/_alp/Classes/Class.J_ChargePoint.java b/_alp/Classes/Class.J_ChargePoint.java
index 9a94027..ba9573a 100644
--- a/_alp/Classes/Class.J_ChargePoint.java
+++ b/_alp/Classes/Class.J_ChargePoint.java
@@ -1,6 +1,16 @@
 /**
  * J_ChargePoint
  */	
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,    // 
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+
 public class J_ChargePoint implements I_ChargePointRegistration{
 	
 	private boolean hasSocketRestrictions;
@@ -15,6 +25,11 @@ public class J_ChargePoint implements I_ChargePointRegistration{
 
 	private List<I_ChargingRequest> storedActiveChargingRequests = null;
 
+	//Constructor for (de-)serialisation
+	public J_ChargePoint() {
+		
+	};
+	
 	/**
      * Default constructor
      * No restrictions on sockets
diff --git a/_alp/Classes/Class.J_ChargingManagementGridBalancing.java b/_alp/Classes/Class.J_ChargingManagementGridBalancing.java
index 6fec128..599c8cd 100644
--- a/_alp/Classes/Class.J_ChargingManagementGridBalancing.java
+++ b/_alp/Classes/Class.J_ChargingManagementGridBalancing.java
@@ -23,6 +23,9 @@ public class J_ChargingManagementGridBalancing implements I_ChargingManagement {
     /**
      * Default constructor
      */
+    public J_ChargingManagementGridBalancing( ) {
+    }
+    
     public J_ChargingManagementGridBalancing( GridConnection gc) {
     	this.gc = gc;
     	this.timeStep_h = gc.energyModel.p_timeParameters.getTimeStep_h();
diff --git a/_alp/Classes/Class.J_ChargingManagementLocalBalancing.java b/_alp/Classes/Class.J_ChargingManagementLocalBalancing.java
index 1b32268..db4dffb 100644
--- a/_alp/Classes/Class.J_ChargingManagementLocalBalancing.java
+++ b/_alp/Classes/Class.J_ChargingManagementLocalBalancing.java
@@ -28,6 +28,9 @@ public class J_ChargingManagementLocalBalancing implements I_ChargingManagement
     /**
      * Default constructor
      */
+    public J_ChargingManagementLocalBalancing( ) {
+    }
+    
     public J_ChargingManagementLocalBalancing( GridConnection gc) {
     	this.gc = gc;
     	this.filterDiffGain_r = 1/(filterTimeScale_h/gc.energyModel.p_timeStep_h);
diff --git a/_alp/Classes/Class.J_ChargingManagementMaxAvailablePower.java b/_alp/Classes/Class.J_ChargingManagementMaxAvailablePower.java
index fe1db1d..a8d5fb1 100644
--- a/_alp/Classes/Class.J_ChargingManagementMaxAvailablePower.java
+++ b/_alp/Classes/Class.J_ChargingManagementMaxAvailablePower.java
@@ -22,6 +22,10 @@ public class J_ChargingManagementMaxAvailablePower implements I_ChargingManageme
     /**
      * Default constructor
      */
+    public J_ChargingManagementMaxAvailablePower( ) {
+    
+    }
+    
     public J_ChargingManagementMaxAvailablePower( GridConnection gc) {
     	this.gc = gc;
     }
diff --git a/_alp/Classes/Class.J_ChargingManagementOffPeak.java b/_alp/Classes/Class.J_ChargingManagementOffPeak.java
index a5c2141..fc9e81e 100644
--- a/_alp/Classes/Class.J_ChargingManagementOffPeak.java
+++ b/_alp/Classes/Class.J_ChargingManagementOffPeak.java
@@ -32,6 +32,9 @@ public class J_ChargingManagementOffPeak implements I_ChargingManagement {
     /**
      * Default constructor
      */
+    public J_ChargingManagementOffPeak( ) {
+    }
+    
     public J_ChargingManagementOffPeak( GridConnection gc) {
     	this.gc = gc;
     	this.filterDiffGain_r = 1/(filterTimeScale_h/gc.energyModel.p_timeStep_h);
diff --git a/_alp/Classes/Class.J_ChargingManagementPrice.java b/_alp/Classes/Class.J_ChargingManagementPrice.java
index a0fa817..e3ddefc 100644
--- a/_alp/Classes/Class.J_ChargingManagementPrice.java
+++ b/_alp/Classes/Class.J_ChargingManagementPrice.java
@@ -28,6 +28,9 @@ public class J_ChargingManagementPrice implements I_ChargingManagement {
     /**
      * Default constructor
      */
+    public J_ChargingManagementPrice( ) {
+    }
+    
     public J_ChargingManagementPrice( GridConnection gc) {
     	this.gc = gc;
     	this.priceFilterDiffGain_r = 1/(priceFilterTimeScale_h/gc.energyModel.p_timeStep_h);
diff --git a/_alp/Classes/Class.J_ChargingManagementSimple.java b/_alp/Classes/Class.J_ChargingManagementSimple.java
index 899d77e..89f07a8 100644
--- a/_alp/Classes/Class.J_ChargingManagementSimple.java
+++ b/_alp/Classes/Class.J_ChargingManagementSimple.java
@@ -23,6 +23,10 @@ public class J_ChargingManagementSimple implements I_ChargingManagement {
     /**
      * Default constructor
      */
+    public J_ChargingManagementSimple( ) {
+    
+    }
+    
     public J_ChargingManagementSimple( GridConnection gc) {
     	this.gc = gc;
     }
diff --git a/_alp/Classes/Class.J_TimeParameters.java b/_alp/Classes/Class.J_TimeParameters.java
index 1d48b4f..6989a55 100644
--- a/_alp/Classes/Class.J_TimeParameters.java
+++ b/_alp/Classes/Class.J_TimeParameters.java
@@ -1,6 +1,8 @@
 /**
  * J_TimeParameters
  */	
+import com.fasterxml.jackson.annotation.JsonIgnoreType;
+@JsonIgnoreType
 public class J_TimeParameters {
 	////Time parameters:
 	private static double timeStep_h = 0.25;
diff --git a/_alp/Classes/Class.J_TimeVariables.java b/_alp/Classes/Class.J_TimeVariables.java
index 615c1c5..61577e6 100644
--- a/_alp/Classes/Class.J_TimeVariables.java
+++ b/_alp/Classes/Class.J_TimeVariables.java
@@ -1,6 +1,8 @@
 /**
  * J_TimeVariables
  */	
+import com.fasterxml.jackson.annotation.JsonIgnoreType;
+@JsonIgnoreType
 public class J_TimeVariables {
 	////Time Variables -> Updated every timestep
 	private static double t_h = 0; //Current energymodel runtime: t_h = 0, corresponds to 'jan 1 0:00' of the start year 

From ac2041cd6e051b6c4e6754eb1956f95afda2009f Mon Sep 17 00:00:00 2001
From: GillisHommen <gillis@zenmo.com>
Date: Tue, 3 Feb 2026 15:05:04 +0100
Subject: [PATCH 2/3] Serialisation fixes after update from main.

---
 _alp/Agents/EnergyCoop/AOC.EnergyCoop.xml     |   3 +-
 _alp/Agents/EnergyCoop/Code/Functions.java    |  13 +-
 _alp/Agents/EnergyCoop/Code/Functions.xml     |   5 +-
 .../EnergyDataViewer/Code/Functions.java      |   2 +-
 _alp/Agents/EnergyModel/AOC.EnergyModel.xml   |  24 ---
 _alp/Agents/EnergyModel/Code/Functions.java   |   1 +
 _alp/Classes/Class.I_AssetOwner.java          |  12 ++
 _alp/Classes/Class.I_HeatingAsset.java        |  13 ++
 _alp/Classes/Class.I_Vehicle.java             |  13 ++
 ...ass.J_ChargingManagementGridBalancing.java | 109 ++++++++++++++
 ...ss.J_ChargingManagementLocalBalancing.java | 105 +++++++++++++
 ...J_ChargingManagementMaxAvailablePower.java | 104 +++++++++++++
 .../Class.J_ChargingManagementOffPeak.java    | 138 ++++++++++++++++++
 .../Class.J_ChargingManagementPrice.java      | 111 ++++++++++++++
 .../Class.J_ChargingManagementSimple.java     |  80 ++++++++++
 _alp/Classes/Class.J_TimeParameters.java      | 130 +++++++++++++++++
 _alp/Classes/Class.J_TimeVariables.java       | 125 ++++++++++++++++
 17 files changed, 959 insertions(+), 29 deletions(-)
 create mode 100644 _alp/Classes/Class.J_ChargingManagementGridBalancing.java
 create mode 100644 _alp/Classes/Class.J_ChargingManagementLocalBalancing.java
 create mode 100644 _alp/Classes/Class.J_ChargingManagementMaxAvailablePower.java
 create mode 100644 _alp/Classes/Class.J_ChargingManagementOffPeak.java
 create mode 100644 _alp/Classes/Class.J_ChargingManagementPrice.java
 create mode 100644 _alp/Classes/Class.J_ChargingManagementSimple.java
 create mode 100644 _alp/Classes/Class.J_TimeParameters.java
 create mode 100644 _alp/Classes/Class.J_TimeVariables.java

diff --git a/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml b/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml
index e7981c8..63bdbb9 100644
--- a/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml
+++ b/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml
@@ -54,7 +54,8 @@ fm_currentConsumptionFlows_kW = new J_FlowsMap();
 fm_currentBalanceFlows_kW = new J_FlowsMap();
 fm_heatFromEnergyCarrier_kW = new J_FlowsMap();
 fm_consumptionForHeating_kW = new J_FlowsMap();
-fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);]]></StartupCode>
+fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
+]]></StartupCode>
 	<Generic>false</Generic>
 	<GenericParameter>
 		<Id>1660731375014</Id>
diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java
index f4f8ee3..93b86ab 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.java
+++ b/_alp/Agents/EnergyCoop/Code/Functions.java
@@ -595,6 +595,7 @@
 	}
 }
 
+
 acc_totalOwnElectricityProduction_kW = new ZeroAccumulator(true, timeParameters.getTimeStep_h(), 8760);
 acc_totalCustomerDelivery_kW = new ZeroAccumulator(true, timeParameters.getTimeStep_h(), 8760);
 acc_totalCustomerFeedIn_kW = new ZeroAccumulator(true, timeParameters.getTimeStep_h(), 8760);
@@ -1425,8 +1426,14 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 }
 /*ALCODEEND*/}
 
-double f_startAfterDeserialisation()
+double f_startAfterDeserialisation(J_TimeParameters timeParameters)
 {/*ALCODESTART::1753348770752*/
+acc_totalOwnElectricityProduction_kW = new ZeroAccumulator(true, timeParameters.getTimeStep_h(), 8760);
+acc_totalCustomerDelivery_kW = new ZeroAccumulator(true, timeParameters.getTimeStep_h(), 8760);
+acc_totalCustomerFeedIn_kW = new ZeroAccumulator(true, timeParameters.getTimeStep_h(), 8760);
+
+v_liveData.resetLiveDatasets(timeParameters);
+/*
 v_liveData = new J_LiveData(this);
 v_liveData.activeEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
 v_liveData.activeProductionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
@@ -1435,7 +1442,7 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 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) {
@@ -1450,6 +1457,8 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 fm_currentConsumptionFlows_kW = new J_FlowsMap();
 fm_currentBalanceFlows_kW = new J_FlowsMap();
 fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
+*/
+
 
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/EnergyCoop/Code/Functions.xml b/_alp/Agents/EnergyCoop/Code/Functions.xml
index e911060..063934b 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.xml
+++ b/_alp/Agents/EnergyCoop/Code/Functions.xml
@@ -626,7 +626,6 @@
 		<ReturnType>double</ReturnType>
 		<Id>1753348770752</Id>
 		<Name><![CDATA[f_startAfterDeserialisation]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>980</X>
 		<Y>70</Y>
 		<Label>
@@ -636,6 +635,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[timeParameters]]></Name>
+			<Type><![CDATA[J_TimeParameters]]></Type>
+		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="public" StaticFunction="false">
diff --git a/_alp/Agents/EnergyDataViewer/Code/Functions.java b/_alp/Agents/EnergyDataViewer/Code/Functions.java
index deb00cb..4dee4f0 100644
--- a/_alp/Agents/EnergyDataViewer/Code/Functions.java
+++ b/_alp/Agents/EnergyDataViewer/Code/Functions.java
@@ -382,7 +382,7 @@
 */
 // Other
 v_dataNetLoadWinterWeek_kW = data.getRapidRunData().am_winterWeekBalanceAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getDataSet(winterWeekStartTime_h);
-v_dataBatterySOCSummerWeek_fr = new DataSet((int) (168 / timeParameters.getTimeStep_h()));
+v_dataBatterySOCWinterWeek_fr = new DataSet((int) (168 / timeParameters.getTimeStep_h()));
 DataSet winterWeekBatteryStorage = data.getRapidRunData().ts_winterWeekBatteriesStoredEnergy_MWh.getDataSet(winterWeekStartTime_h);
 for (int i = 0; i < winterWeekBatteryStorage.size(); i++) {
     // Get the x and y values from the source dataset
diff --git a/_alp/Agents/EnergyModel/AOC.EnergyModel.xml b/_alp/Agents/EnergyModel/AOC.EnergyModel.xml
index 77e43f0..84f6d0d 100644
--- a/_alp/Agents/EnergyModel/AOC.EnergyModel.xml
+++ b/_alp/Agents/EnergyModel/AOC.EnergyModel.xml
@@ -185,30 +185,6 @@ fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);]]></Star
 			<LineArrow>NONE</LineArrow>
 			<LineArrowPosition>END</LineArrowPosition>
 		</AgentLink>
-		<AgentLink>
-			<Id>1696520909218</Id>
-			<Name><![CDATA[connections1]]></Name>
-			<ExcludeFromBuild>true</ExcludeFromBuild>
-			<X>40</X>
-			<Y>-180</Y>
-			<Label>
-				<X>15</X>
-				<Y>0</Y>
-			</Label>
-			<PublicFlag>false</PublicFlag>
-			<PresentationFlag>true</PresentationFlag>
-			<ShowLabel>true</ShowLabel>
-			<HandleReceiveInConnections>false</HandleReceiveInConnections>
-			<AgentLinkType>COLLECTION_OF_LINKS</AgentLinkType>
-			<AgentLinkBidirectional>false</AgentLinkBidirectional>
-			<MessageType>Object</MessageType>
-			<LineStyle>SOLID</LineStyle>
-			<LineWidth>1</LineWidth>
-			<LineColor>-16777216</LineColor>
-			<LineZOrder>UNDER_AGENTS</LineZOrder>
-			<LineArrow>NONE</LineArrow>
-			<LineArrowPosition>END</LineArrowPosition>
-		</AgentLink>
 	</AgentLinks>
 	<EmbeddedObjects xmlns:al="http://anylogic.com"/>
 	<Presentation>
diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index 7bf5ac9..933dd5b 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -1080,6 +1080,7 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
 	ec.fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
 	ec.fm_heatFromEnergyCarrier_kW = new J_FlowsMap();
 	ec.fm_consumptionForHeating_kW = new J_FlowsMap();
+	ec.f_startAfterDeserialisation(p_timeParameters);
 }
 
 // Reconstruct the LiveData class in the GridConnections and add EnergyCarriers
diff --git a/_alp/Classes/Class.I_AssetOwner.java b/_alp/Classes/Class.I_AssetOwner.java
index 9bd9c14..3afd7d0 100644
--- a/_alp/Classes/Class.I_AssetOwner.java
+++ b/_alp/Classes/Class.I_AssetOwner.java
@@ -1,3 +1,15 @@
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+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"  // 👈 this will be the field name in your JSON
+	)
+
 public interface I_AssetOwner
 {
 	void f_connectToJ_EA(J_EA ea, J_TimeParameters timeParameters);
diff --git a/_alp/Classes/Class.I_HeatingAsset.java b/_alp/Classes/Class.I_HeatingAsset.java
index 48cb56b..a6b02da 100644
--- a/_alp/Classes/Class.I_HeatingAsset.java
+++ b/_alp/Classes/Class.I_HeatingAsset.java
@@ -1,3 +1,16 @@
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+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"  // 👈 this will be the field name in your JSON
+	)
+
+
 public interface I_HeatingAsset
 {
 	public J_FlowsMap get_heatFromEnergyCarrier_kW(); // Map with a single entry for the energycarrier that is 'burned'
diff --git a/_alp/Classes/Class.I_Vehicle.java b/_alp/Classes/Class.I_Vehicle.java
index 26b3b42..042fedd 100644
--- a/_alp/Classes/Class.I_Vehicle.java
+++ b/_alp/Classes/Class.I_Vehicle.java
@@ -1,3 +1,16 @@
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+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"  // 👈 this will be the field name in your JSON
+	)
+
+
 public interface I_Vehicle
 {
 	// These methods can't have default implementations because they use the Object States.
diff --git a/_alp/Classes/Class.J_ChargingManagementGridBalancing.java b/_alp/Classes/Class.J_ChargingManagementGridBalancing.java
new file mode 100644
index 0000000..cf93051
--- /dev/null
+++ b/_alp/Classes/Class.J_ChargingManagementGridBalancing.java
@@ -0,0 +1,109 @@
+/**
+ * J_ChargingManagementGridBalancing
+ */	
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import java.util.EnumSet;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+public class J_ChargingManagementGridBalancing implements I_ChargingManagement {
+
+    private GridConnection gc;
+    private J_TimeParameters timeParameters;
+    private double timeStep_h;
+    private OL_ChargingAttitude activeChargingType = OL_ChargingAttitude.BALANCE_GRID;
+    private boolean V2GActive = false;
+
+    /**
+     * Default constructor
+     */
+    public J_ChargingManagementGridBalancing( ) {
+    }
+    
+    public J_ChargingManagementGridBalancing( GridConnection gc, J_TimeParameters timeParameters) {
+    	this.gc = gc;
+    	this.timeParameters = timeParameters;
+    	this.timeStep_h = timeParameters.getTimeStep_h();
+    }
+      
+    public OL_ChargingAttitude getCurrentChargingType() {
+    	return activeChargingType;
+    }
+    
+    /**
+     * One of the simplest charging algorithms.
+     * 
+     */
+    public void manageCharging(J_ChargePoint chargePoint, J_TimeVariables timeVariables) {
+    	double t_h = timeVariables.getT_h();
+    
+    	for (I_ChargingRequest chargeRequest : chargePoint.getCurrentActiveChargingRequests()) {
+	    	double chargeSetpoint_kW = 0;
+			double maxChargePower = chargePoint.getMaxChargingCapacity_kW(chargeRequest);
+			double remainingChargeDemand_kWh = chargeRequest.getRemainingChargeDemand_kWh(); // Can be negative if recharging is not needed for next trip!
+	
+			GridNode parentNode = gc.p_parentNodeElectric;
+			double currentBalanceOnGridNodeWithoutEV_kW = parentNode.v_currentLoad_kW - parentNode.f_getCurrentChargingPowerBalancingThisGN_kW();
+	    	double gridNodeLowPassedLoad_kW = parentNode.v_lowPassedLoadFilter_kW;
+	    	
+			double nextTripStartTime_h = chargeRequest.getLeaveTime_h();
+			double chargeTimeMargin_h = 0.5; // Margin to be ready with charging before start of next trip
+			double chargeDeadline_h =  nextTripStartTime_h - remainingChargeDemand_kWh / maxChargePower - chargeTimeMargin_h;
+			double remainingFlexTime_h = chargeDeadline_h - t_h; // measure of flexiblity left in current charging session.
+			double remainingTimeToCharge = nextTripStartTime_h - t_h - chargeTimeMargin_h;
+			
+			if ( t_h >= chargeDeadline_h && remainingChargeDemand_kWh > 0) { // Must-charge time at max charging power
+				chargeSetpoint_kW = min(maxChargePower, remainingChargeDemand_kWh / this.timeStep_h);	
+			} else {
+				double flexGain_r_manual = 0.8;
+				double flexGain_r = 1/max(1, (double)parentNode.f_getCurrentNumberOfChargeRequestsBalancingThisGN()) * flexGain_r_manual; // how strongly to 'follow' currentBalanceBeforeEV_kW -> influenced by the amount of charging chargers at this momment
+				chargeSetpoint_kW = max(0, chargeRequest.getRemainingAverageChargingDemand_kW(t_h) + (gridNodeLowPassedLoad_kW - currentBalanceOnGridNodeWithoutEV_kW) * (min(1,flexGain_r)));			    				
+				if ( this.V2GActive && chargePoint.getV2GCapable() && chargeRequest.getV2GCapable() && remainingFlexTime_h > 1 && chargeSetpoint_kW == 0 ) { // Surpluss flexibility
+					chargeSetpoint_kW = min(0, chargeRequest.getRemainingAverageChargingDemand_kW(t_h) + (gridNodeLowPassedLoad_kW - currentBalanceOnGridNodeWithoutEV_kW) * (min(1,flexGain_r)));
+				}    
+			}
+
+	    	//Send the chargepower setpoint to the chargepoint
+	       	chargePoint.charge(chargeRequest, chargeSetpoint_kW, timeVariables, gc);
+    	}
+ 
+    }
+    
+	public void setV2GActive(boolean activateV2G) {
+		this.V2GActive = activateV2G;
+		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_chargingSessions.forEach(cs -> cs.setV2GActive(activateV2G)); // NEEDED TO HAVE CS ASSET IN CORRECT assetFlowCatagory
+	}
+	
+	public boolean getV2GActive() {
+		return this.V2GActive;
+	}
+	
+	
+    //Get parentagent
+    public Agent getParentAgent() {
+    	return this.gc;
+    }
+    
+    //Store and reset states
+	public void storeStatesAndReset() {
+		
+	}
+	public void restoreStates() {
+
+	}
+	
+	
+    @Override
+	public String toString() {
+		return "Active charging type: " + this.activeChargingType;
+
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingManagementLocalBalancing.java b/_alp/Classes/Class.J_ChargingManagementLocalBalancing.java
new file mode 100644
index 0000000..31d6b67
--- /dev/null
+++ b/_alp/Classes/Class.J_ChargingManagementLocalBalancing.java
@@ -0,0 +1,105 @@
+/**
+ * J_ChargingManagementLocalBalancing
+ */	
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+public class J_ChargingManagementLocalBalancing implements I_ChargingManagement {
+
+    private GridConnection gc;
+    private J_TimeParameters timeParameters;
+    private OL_ChargingAttitude activeChargingType = OL_ChargingAttitude.BALANCE_LOCAL;
+    private double filterTimeScale_h = 5*24;
+    private double filterDiffGain_r;
+    private double initialValueGCdemandLowPassed_kW = 0.5;
+    private double GCdemandLowPassed_kW = this.initialValueGCdemandLowPassed_kW;
+    
+    private boolean V2GActive = false;
+    
+    //Stored
+    private double storedGCdemandLowPassed_kW;
+    
+    /**
+     * Default constructor
+     */
+    public J_ChargingManagementLocalBalancing( ) {
+    }
+    
+    public J_ChargingManagementLocalBalancing( GridConnection gc, J_TimeParameters timeParameters) {
+    	this.gc = gc;
+    	this.timeParameters = timeParameters;
+    	this.filterDiffGain_r = 1/(filterTimeScale_h/timeParameters.getTimeStep_h());
+    }
+    
+    public OL_ChargingAttitude getCurrentChargingType() {
+    	return activeChargingType;
+    }
+    /**
+     * One of the simplest charging algorithms.
+     * 
+     */
+    public void manageCharging(J_ChargePoint chargePoint, J_TimeVariables timeVariables) {    	
+    	double t_h = timeVariables.getT_h();
+
+    	// Use current GC-load (so without EV charging!) as an 'equivalent price' signal, and use EV battery flexibility to make local load flatter.
+    	double currentBalanceBeforeEV_kW = gc.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
+    	GCdemandLowPassed_kW += (currentBalanceBeforeEV_kW - GCdemandLowPassed_kW) * filterDiffGain_r;
+    	
+       	for (I_ChargingRequest chargingRequest : chargePoint.getCurrentActiveChargingRequests()) {
+			double chargeNeedForNextTrip_kWh = chargingRequest.getEnergyNeedForNextTrip_kWh() - chargingRequest.getCurrentSOC_kWh(); // Can be negative if recharging is not needed for next trip!
+			double remainingFlexTime_h = chargePoint.getChargeDeadline_h(chargingRequest) - t_h; // measure of flexiblity left in current charging session.
+			double avgPowerDemandTillTrip_kW = chargingRequest.getEnergyNeedForNextTrip_kWh() / (chargingRequest.getLeaveTime_h() - t_h);
+			double chargeSetpoint_kW = 0;    			
+			if ( t_h >= chargePoint.getChargeDeadline_h(chargingRequest) && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
+				chargeSetpoint_kW = chargePoint.getMaxChargingCapacity_kW(chargingRequest);	
+			} else {
+				double flexGain_r = 0.5; // how strongly to 'follow' currentBalanceBeforeEV_kW
+				chargeSetpoint_kW = max(0, avgPowerDemandTillTrip_kW + (GCdemandLowPassed_kW - currentBalanceBeforeEV_kW) * (min(1,remainingFlexTime_h*flexGain_r)));			    				
+    			if ( this.V2GActive && chargePoint.getV2GCapable() && chargingRequest.getV2GCapable() && remainingFlexTime_h > 1 && chargeSetpoint_kW == 0 ) { // Surpluss flexibility
+					chargeSetpoint_kW = min(0, avgPowerDemandTillTrip_kW - (currentBalanceBeforeEV_kW - GCdemandLowPassed_kW) * (min(1,remainingFlexTime_h*flexGain_r)));
+				}    
+			}
+	    	//Send the chargepower setpoint to the chargepoint			
+			chargePoint.charge(chargingRequest, chargeSetpoint_kW, timeVariables, gc);  		
+    	}
+    }
+
+	public void setV2GActive(boolean activateV2G) {
+		this.V2GActive = activateV2G;
+		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_chargingSessions.forEach(cs -> cs.setV2GActive(activateV2G)); // NEEDED TO HAVE CS ASSET IN CORRECT assetFlowCatagory
+	}
+	
+	public boolean getV2GActive() {
+		return this.V2GActive;
+	}
+	
+	
+	
+    //Get parentagent
+    public Agent getParentAgent() {
+    	return this.gc;
+    }
+	
+    //Store and reset states
+	public void storeStatesAndReset() {
+		this.storedGCdemandLowPassed_kW = this.GCdemandLowPassed_kW;
+		this.GCdemandLowPassed_kW = this.initialValueGCdemandLowPassed_kW;
+	}
+	public void restoreStates() {
+		this.GCdemandLowPassed_kW = this.storedGCdemandLowPassed_kW;
+	}
+	
+	@Override
+	public String toString() {
+		return "Active charging type: " + this.activeChargingType;
+
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingManagementMaxAvailablePower.java b/_alp/Classes/Class.J_ChargingManagementMaxAvailablePower.java
new file mode 100644
index 0000000..68ea61f
--- /dev/null
+++ b/_alp/Classes/Class.J_ChargingManagementMaxAvailablePower.java
@@ -0,0 +1,104 @@
+/**
+ * J_ChargingManagementMaxAvailablePower
+ */	
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+
+public class J_ChargingManagementMaxAvailablePower implements I_ChargingManagement {
+	private GridConnection gc;
+    private J_TimeParameters timeParameters;
+    private OL_ChargingAttitude activeChargingType = OL_ChargingAttitude.MAX_POWER;
+    
+    private boolean V2GActive = false;
+    
+    /**
+     * Default constructor
+     */
+    public J_ChargingManagementMaxAvailablePower( ) {
+    
+    }
+    
+    public J_ChargingManagementMaxAvailablePower( GridConnection g, J_TimeParameters timeParametersc) {
+    	this.gc = gc;
+    	this.timeParameters = timeParameters;
+    }
+    
+    public OL_ChargingAttitude getCurrentChargingType() {
+    	return activeChargingType;
+    }
+    
+    public void manageCharging(J_ChargePoint chargePoint, J_TimeVariables timeVariables) {
+    	double t_h = timeVariables.getT_h();
+
+    	double remainingChargingPower_kW = gc.v_liveConnectionMetaData.contractedDeliveryCapacity_kW - gc.fm_currentBalanceFlows_kW.get(ELECTRICITY);
+    	if (gc.p_batteryAsset!=null) {
+    		remainingChargingPower_kW += gc.p_batteryAsset.getCapacityAvailable_kW();
+    	}
+    	ArrayList<I_ChargingRequest> copiedChargingRequestList = new ArrayList<>(chargePoint.getCurrentActiveChargingRequests());
+    	//this.chargePoint.getCurrentActiveChargingRequests().forEach(chargingRequest -> {if(ev.getAvailability() && ev.getCurrentStateOfCharge_fr()<1) { copiedVehicleList.add(ev);}}); // only vehicle that are available and not full
+    	//int countDeletedItems = 0;
+
+    	// Sort chargingRequests by time until charge deadline
+    	copiedChargingRequestList.sort((chargingRequest1, chargingRequest2) -> Double.compare(chargePoint.getChargeDeadline_h(chargingRequest1), chargePoint.getChargeDeadline_h(chargingRequest2)));
+
+    	for ( I_ChargingRequest chargingRequest : copiedChargingRequestList){
+			double chargeNeedForNextTrip_kWh = max(0, chargingRequest.getEnergyNeedForNextTrip_kWh() - chargingRequest.getCurrentSOC_kWh());
+			
+			double chargingSetpoint_kW;
+			if ( t_h >= chargePoint.getChargeDeadline_h(chargingRequest) && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
+				chargingSetpoint_kW =  chargePoint.getMaxChargingCapacity_kW(chargingRequest);	
+			}
+			else {
+				chargingSetpoint_kW = remainingChargingPower_kW;
+			}
+			
+			double chargingPower_kW = min(max(0,chargingSetpoint_kW), chargePoint.getMaxChargingCapacity_kW(chargingRequest));
+			
+			//Send the chargepower setpoints to the chargepoint
+	       	chargePoint.charge(chargingRequest, chargingPower_kW, timeVariables, gc); 
+			remainingChargingPower_kW = max(0, remainingChargingPower_kW - chargingPower_kW); // Assumes the asset complies with the command!   			
+    	}
+    }
+    
+	public void setV2GActive(boolean activateV2G) {
+		this.V2GActive = activateV2G;
+		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_chargingSessions.forEach(cs -> cs.setV2GActive(activateV2G)); // NEEDED TO HAVE CS ASSET IN CORRECT assetFlowCatagory
+	}
+	
+	public boolean getV2GActive() {
+		return this.V2GActive;
+	}
+	
+	
+	
+	
+    //Get parentagent
+    public Agent getParentAgent() {
+    	return this.gc;
+    }
+    
+	//Store and reset states
+	public void storeStatesAndReset() {
+		
+	}
+	public void restoreStates() {
+		
+	}
+	
+	
+	@Override
+	public String toString() {
+		return "Active charging type: " + this.activeChargingType;
+
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingManagementOffPeak.java b/_alp/Classes/Class.J_ChargingManagementOffPeak.java
new file mode 100644
index 0000000..83b9bd0
--- /dev/null
+++ b/_alp/Classes/Class.J_ChargingManagementOffPeak.java
@@ -0,0 +1,138 @@
+/**
+ * J_ChargingManagementOffPeak
+ */	
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+public class J_ChargingManagementOffPeak implements I_ChargingManagement {
+
+    private GridConnection gc;
+    private J_TimeParameters timeParameters;
+    private OL_ChargingAttitude activeChargingType = OL_ChargingAttitude.BALANCE_GRID;
+    private double filterTimeScale_h = 5*24;
+    private double filterDiffGain_r;
+    private double initialValueGCdemandLowPassed_kW = 0.5;
+    private double GCdemandLowPassed_kW = this.initialValueGCdemandLowPassed_kW;
+    
+    private double startTimeOfReducedChargingInterval_hr = 17; // Hour of the day
+    private double endTimeOfReducedChargingInterval_hr = 21; // Hour of the day
+    
+    private boolean V2GActive = false;
+    
+    
+    //Stored
+    private double storedGCdemandLowPassed_kW;
+    
+    /**
+     * Default constructor
+     */
+    public J_ChargingManagementOffPeak( ) {
+    }
+    
+    public J_ChargingManagementOffPeak( GridConnection gc, J_TimeParameters timeParameters) {
+    	this.gc = gc;
+    	this.timeParameters = timeParameters;
+    	this.filterDiffGain_r = 1/(filterTimeScale_h/timeParameters.getTimeStep_h());
+    }
+   
+    
+    public OL_ChargingAttitude getCurrentChargingType() {
+    	return activeChargingType;
+    }
+    /**
+     * One of the simplest charging algorithms.
+     * 
+     */
+    public void manageCharging(J_ChargePoint chargePoint, J_TimeVariables timeVariables) {    	
+    	double t_h = timeVariables.getT_h();
+   
+    	// Use current GC-load (so without EV charging!) as an 'equivalent price' signal, and use EV battery flexibility to make local load flatter.
+    	double currentBalanceBeforeEV_kW = gc.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
+    	GCdemandLowPassed_kW += (currentBalanceBeforeEV_kW - GCdemandLowPassed_kW) * filterDiffGain_r;
+    	
+		//Determine if time is currently in reduced charging interval
+		double hourOfTheDay = t_h % 24;
+		
+		double intervalLength_hr = (endTimeOfReducedChargingInterval_hr - startTimeOfReducedChargingInterval_hr + 24) % 24;
+		if(intervalLength_hr == 0) intervalLength_hr = 24; // (Start time == End time: for now defined as charge as little as possible all day.
+		double intervalEndTimeSinceModelStart_hr = t_h - ((t_h - startTimeOfReducedChargingInterval_hr + 24) % 24) + intervalLength_hr;
+		boolean timeIsInReducedChargingInterval = ((hourOfTheDay - startTimeOfReducedChargingInterval_hr + 24) % 24) < intervalLength_hr;
+
+       	for (I_ChargingRequest chargingRequest : chargePoint.getCurrentActiveChargingRequests()) {
+			double chargeNeedForNextTrip_kWh = chargingRequest.getEnergyNeedForNextTrip_kWh() - chargingRequest.getCurrentSOC_kWh(); // Can be negative if recharging is not needed for next trip!
+			double chargeSetpoint_kW = 0;    			
+			if ( t_h >= chargePoint.getChargeDeadline_h(chargingRequest) && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
+				chargeSetpoint_kW = chargePoint.getMaxChargingCapacity_kW(chargingRequest);	
+			} else {
+				if(timeIsInReducedChargingInterval && chargeNeedForNextTrip_kWh > 0) {
+    				double chargeTimeMargin_h = 0.5; // Margin to be ready with charging before start of next trip
+    				double timeBetweenEndOfIntervalAndNextTripStartTime_hr = max(0, chargingRequest.getLeaveTime_h() - intervalEndTimeSinceModelStart_hr - chargeTimeMargin_h);
+    				double energyThatCanBeChargedAfterIntervalEnded_kWh = timeBetweenEndOfIntervalAndNextTripStartTime_hr * chargePoint.getMaxChargingCapacity_kW(chargingRequest);
+    				double energyThatNeedsToBeChargedDuringInterval_kWh = max(0, chargeNeedForNextTrip_kWh - energyThatCanBeChargedAfterIntervalEnded_kWh);
+    		    	
+    				double avgPowerDemandTillEndOfInterval_kW = energyThatNeedsToBeChargedDuringInterval_kWh / (intervalEndTimeSinceModelStart_hr - t_h);
+    				chargeSetpoint_kW = avgPowerDemandTillEndOfInterval_kW;
+				}
+				else { // Dom laden
+					chargeSetpoint_kW = chargePoint.getMaxChargingCapacity_kW(chargingRequest);
+				}
+			}
+	    	//Send the chargepower setpoints to the chargepoint
+	       	chargePoint.charge(chargingRequest, chargeSetpoint_kW, timeVariables, gc); 
+    	}
+    }
+
+    public void setStartTimeOfReducedChargingInterval_hr(double startTimeOfReducedChargingInterval_hr) {
+    	this.startTimeOfReducedChargingInterval_hr = startTimeOfReducedChargingInterval_hr;
+    }
+    
+    public void setEndTimeOfReducedChargingInterval_hr(double endTimeOfReducedChargingInterval_hr) {
+    	this.endTimeOfReducedChargingInterval_hr = endTimeOfReducedChargingInterval_hr;
+    }  
+    
+    public double getStartTimeOfReducedChargingInterval_hr() {
+    	return this.startTimeOfReducedChargingInterval_hr;
+    }
+    
+    public double getEndTimeOfReducedChargingInterval_hr() {
+    	return this.endTimeOfReducedChargingInterval_hr;
+    }
+    
+	public void setV2GActive(boolean activateV2G) {
+		this.V2GActive = activateV2G;
+		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_chargingSessions.forEach(cs -> cs.setV2GActive(activateV2G)); // NEEDED TO HAVE CS ASSET IN CORRECT assetFlowCatagory
+	}
+	
+	public boolean getV2GActive() {
+		return this.V2GActive;
+	}
+	
+	
+	
+    //Get parentagent
+    public Agent getParentAgent() {
+    	return this.gc;
+    }
+    
+    //Store and reset states
+	public void storeStatesAndReset() {
+		this.storedGCdemandLowPassed_kW = this.GCdemandLowPassed_kW;
+		this.GCdemandLowPassed_kW = this.initialValueGCdemandLowPassed_kW;
+	}
+	public void restoreStates() {
+		this.GCdemandLowPassed_kW = this.storedGCdemandLowPassed_kW;
+	}
+	
+	@Override
+	public String toString() {
+		return "Active charging type: " + this.activeChargingType;
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingManagementPrice.java b/_alp/Classes/Class.J_ChargingManagementPrice.java
new file mode 100644
index 0000000..c91eb85
--- /dev/null
+++ b/_alp/Classes/Class.J_ChargingManagementPrice.java
@@ -0,0 +1,111 @@
+/**
+ * J_ChargingManagementPrice
+ */	
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+public class J_ChargingManagementPrice implements I_ChargingManagement {
+
+    private GridConnection gc;
+    private J_TimeParameters timeParameters;
+    private OL_ChargingAttitude activeChargingType = OL_ChargingAttitude.PRICE;
+    private double initialValueElectricityPriceLowPassed_eurpkWh = 0.1;
+    private double electricityPriceLowPassed_eurpkWh = this.initialValueElectricityPriceLowPassed_eurpkWh;
+    private double priceFilterTimeScale_h = 5*24;
+    private double priceFilterDiffGain_r;
+
+    private boolean V2GActive = false;
+    
+    //Stored
+    private double storedElectricityPriceLowPassed_eurpkWh;
+    
+    /**
+     * Default constructor
+     */
+    public J_ChargingManagementPrice( ) {
+    }
+    
+    public J_ChargingManagementPrice( GridConnection gc, J_TimeParameters timeParameters) {
+    	this.gc = gc;
+    	this.timeParameters = timeParameters;
+    	this.priceFilterDiffGain_r = 1/(priceFilterTimeScale_h/timeParameters.getTimeStep_h());
+    }
+        
+    public OL_ChargingAttitude getCurrentChargingType() {
+    	return activeChargingType;
+    }
+    /**
+     * One of the simplest charging algorithms.
+     * 
+     */
+    public void manageCharging(J_ChargePoint chargePoint, J_TimeVariables timeVariables) {
+    	double t_h = timeVariables.getT_h();
+
+    	//double currentElectricityPriceConsumption_eurpkWh = gc.p_owner.f_getElectricityPrice(gc.v_liveConnectionMetaData.contractedDeliveryCapacity_kW);
+    	double currentElectricityPriceConsumption_eurpkWh = gc.energyModel.pp_dayAheadElectricityPricing_eurpMWh.getCurrentValue() * 0.001;
+    	electricityPriceLowPassed_eurpkWh += (currentElectricityPriceConsumption_eurpkWh-electricityPriceLowPassed_eurpkWh) * priceFilterDiffGain_r ;
+       	for (I_ChargingRequest chargingRequest : chargePoint.getCurrentActiveChargingRequests()) {
+			double chargeNeedForNextTrip_kWh = chargingRequest.getEnergyNeedForNextTrip_kWh() - chargingRequest.getCurrentSOC_kWh(); // Can be negative if recharging is not needed for next trip!
+			double remainingFlexTime_h = chargePoint.getChargeDeadline_h(chargingRequest) - t_h; // measure of flexiblity left in current charging session.
+			double WTPoffset_eurpkW = 0.01; // Drops willingness to pay price for charging, combined with remainingFlexTime_h.
+			double chargeSetpoint_kW = 0;    			
+			if ( t_h >= chargePoint.getChargeDeadline_h(chargingRequest) && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
+				chargeSetpoint_kW = chargePoint.getMaxChargingCapacity_kW(chargingRequest);	
+			} else {
+				double WTPCharging_eurpkWh = electricityPriceLowPassed_eurpkWh - WTPoffset_eurpkW * remainingFlexTime_h;  //+ urgencyGain_eurpkWh * ( max(0,maxSpreadChargingPower_kW) / ev.getCapacityElectric_kW() ); // Scale WTP based on flexibility expressed in terms of power-fraction
+				//WTPprice_eurpkWh = WTPoffset_eurpkWh + (main.v_epexNext24hours_eurpkWh+v_electricityPriceLowPassed_eurpkWh)/2 + flexibilityGain_eurpkWh * sqrt(maxSpreadChargingPower_kW/maxChargingPower_kW); 
+				double priceGain_r = 0.5; // When WTP is higher than current electricity price, ramp up charging power with this gain based on the price-delta.
+				chargeSetpoint_kW = max(0, chargePoint.getMaxChargingCapacity_kW(chargingRequest) * (WTPCharging_eurpkWh / currentElectricityPriceConsumption_eurpkWh - 1) * priceGain_r);			
+				//if ( chargeNeedForNextTrip_kWh < -ev.getCapacityElectric_kW()*gc.energyModel.p_timeStep_h && chargeSetpoint_kW == 0 ) { // Surpluss SOC and high energy price
+    			if ( this.V2GActive && chargePoint.getV2GCapable() && chargingRequest.getV2GCapable() && remainingFlexTime_h > 1 && chargeSetpoint_kW == 0 ) { // Surpluss SOC and high energy price
+	    			double V2G_WTS_offset_eurpkWh = 0.02; // Price must be at least this amount above the moving average to decide to discharge EV battery.
+					double WTSV2G_eurpkWh = V2G_WTS_offset_eurpkWh + electricityPriceLowPassed_eurpkWh; // Scale WillingnessToSell based on flexibility expressed in terms of power-fraction
+					chargeSetpoint_kW = min(0, -chargePoint.getMaxChargingCapacity_kW(chargingRequest) * (currentElectricityPriceConsumption_eurpkWh / WTSV2G_eurpkWh - 1) * priceGain_r);
+				}    
+			}
+	    	//Send the chargepower setpoints to the chargepoint
+	       	chargePoint.charge(chargingRequest, chargeSetpoint_kW, timeVariables, gc);					
+    	}
+    }
+
+	public void setV2GActive(boolean activateV2G) {
+		this.V2GActive = activateV2G;
+		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_chargingSessions.forEach(cs -> cs.setV2GActive(activateV2G)); // NEEDED TO HAVE CS ASSET IN CORRECT assetFlowCatagory
+	}
+	
+	public boolean getV2GActive() {
+		return this.V2GActive;
+	}
+	
+	
+	
+	
+    //Get parentagent
+    public Agent getParentAgent() {
+    	return this.gc;
+    }
+    
+    //Store and reset states
+	public void storeStatesAndReset() {
+		this.storedElectricityPriceLowPassed_eurpkWh = this.electricityPriceLowPassed_eurpkWh;
+		this.electricityPriceLowPassed_eurpkWh = this.initialValueElectricityPriceLowPassed_eurpkWh;
+	}
+	public void restoreStates() {
+		this.electricityPriceLowPassed_eurpkWh = this.storedElectricityPriceLowPassed_eurpkWh;
+	}
+	
+	
+    @Override
+ 	public String toString() {
+ 		return "Active charging type: " + this.activeChargingType;
+
+ 	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingManagementSimple.java b/_alp/Classes/Class.J_ChargingManagementSimple.java
new file mode 100644
index 0000000..28ea3ad
--- /dev/null
+++ b/_alp/Classes/Class.J_ChargingManagementSimple.java
@@ -0,0 +1,80 @@
+/**
+ * J_ChargingManagementSimple
+ */	
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import java.util.EnumSet;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+
+public class J_ChargingManagementSimple implements I_ChargingManagement {
+
+    private GridConnection gc;
+    private J_TimeParameters timeParameters;
+    private OL_ChargingAttitude activeChargingType = OL_ChargingAttitude.SIMPLE;
+    private boolean V2GActive = false;
+
+    /**
+     * Default constructor
+     */
+    public J_ChargingManagementSimple( ) {
+    
+    }
+    
+    public J_ChargingManagementSimple( GridConnection gc, J_TimeParameters timeParameters) {
+    	this.gc = gc;
+    	this.timeParameters = timeParameters;
+    }
+      
+    public OL_ChargingAttitude getCurrentChargingType() {
+    	return activeChargingType;
+    }
+    
+    /**
+     * One of the simplest charging algorithms.
+     * 
+     */
+    public void manageCharging(J_ChargePoint chargePoint, J_TimeVariables timeVariables) {
+    	for (I_ChargingRequest chargeRequest : chargePoint.getCurrentActiveChargingRequests()) {
+    		chargePoint.charge(chargeRequest, chargePoint.getMaxChargingCapacity_kW(chargeRequest), timeVariables, gc);
+    	}
+    }
+    
+	public void setV2GActive(boolean activateV2G) {
+		if(activateV2G) {
+			throw new RuntimeException("Trying to Activate V2G for chargingManagement Simple -> Not supported");
+		}
+	}
+	
+	public boolean getV2GActive() {
+		return this.V2GActive;
+	}
+	
+	
+    //Get parentagent
+    public Agent getParentAgent() {
+    	return this.gc;
+    }
+    
+    //Store and reset states
+	public void storeStatesAndReset() {
+		
+	}
+	public void restoreStates() {
+		
+	}
+	
+	
+    @Override
+	public String toString() {
+		return "Active charging type: " + this.activeChargingType;
+
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_TimeParameters.java b/_alp/Classes/Class.J_TimeParameters.java
new file mode 100644
index 0000000..76e4198
--- /dev/null
+++ b/_alp/Classes/Class.J_TimeParameters.java
@@ -0,0 +1,130 @@
+import java.time.LocalDate;
+import java.time.DayOfWeek;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,    // also stores full profiles to file. Maybe arrange a way to 'skip' this?
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+@JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
+
+/**
+ * J_TimeParameters
+ */	
+public final class J_TimeParameters {
+	////Time parameters:
+	private final double timeStep_h;
+	private final int startYear;
+	private final double[] hourOfYearPerMonth;
+	private final int dayOfWeek1jan;
+	private final double runStartTime_h;
+	private final double runEndTime_h;
+	private final int summerWeekNumber;
+	private final int winterWeekNumber;
+	private final double startOfSummerWeek_h;
+	private final double startOfWinterWeek_h;
+	
+	public J_TimeParameters(
+		double timeStep_h,
+		int startYear,
+		double[] hourOfYearPerMonth,
+		double runStartTime_h,
+		double runEndTime_h,
+		int summerWeekNumber,
+		int winterWeekNumber
+	) {
+		this.timeStep_h = timeStep_h;
+		this.startYear = startYear;
+		this.hourOfYearPerMonth = hourOfYearPerMonth;
+		this.runStartTime_h = runStartTime_h;
+		this.runEndTime_h = runEndTime_h;
+		this.summerWeekNumber = summerWeekNumber;
+		this.winterWeekNumber = winterWeekNumber;
+		this.dayOfWeek1jan = DayOfWeek.from(LocalDate.of(startYear, 1, 1)).getValue();
+		this.startOfSummerWeek_h = roundToInt(24 * (summerWeekNumber * 7 + (8-dayOfWeek1jan)%7));
+		this.startOfWinterWeek_h = roundToInt(24 * (winterWeekNumber * 7 + (8-dayOfWeek1jan)%7));
+	}
+	
+	// Creator for deserialisation. (needed because of final fields!)
+	@JsonCreator
+    public J_TimeParameters(
+        @JsonProperty("timeStep_h") double timeStep_h,
+        @JsonProperty("startYear") int startYear,
+        @JsonProperty("hourOfYearPerMonth") double[] hourOfYearPerMonth,
+        @JsonProperty("dayOfWeek1jan") int dayOfWeek1jan,
+        @JsonProperty("runStartTime_h") double runStartTime_h,
+        @JsonProperty("runEndTime_h") double runEndTime_h,
+        @JsonProperty("summerWeekNumber") int summerWeekNumber,
+        @JsonProperty("winterWeekNumber") int winterWeekNumber,
+        @JsonProperty("startOfSummerWeek_h") double startOfSummerWeek_h,
+        @JsonProperty("startOfWinterWeek_h") double startOfWinterWeek_h
+    ) {
+		this(timeStep_h, startYear, hourOfYearPerMonth, runStartTime_h, runEndTime_h, summerWeekNumber, winterWeekNumber);
+		/*this.timeStep_h = timeStep_h;
+		this.startYear = startYear;
+		this.hourOfYearPerMonth = hourOfYearPerMonth;
+		this.runStartTime_h = runStartTime_h;
+		this.runEndTime_h = runEndTime_h;
+		this.summerWeekNumber = summerWeekNumber;
+		this.winterWeekNumber = winterWeekNumber;
+		this.dayOfWeek1jan = DayOfWeek.from(LocalDate.of(startYear, 1, 1)).getValue();
+		this.startOfSummerWeek_h = roundToInt(24 * (summerWeekNumber * 7 + (8-dayOfWeek1jan)%7));
+		this.startOfWinterWeek_h = roundToInt(24 * (winterWeekNumber * 7 + (8-dayOfWeek1jan)%7));*/
+    }
+	
+	////Time Parameter getters
+	public double getTimeStep_h() {
+	    return timeStep_h;
+	}
+	public int getStartYear() {
+	    return startYear;
+	}
+	public double[] getHourOfYearPerMonth() {
+	    return hourOfYearPerMonth;
+	}
+	public int getDayOfWeek1jan() {
+	    return dayOfWeek1jan;
+	}
+	public double getRunStartTime_h() {
+	    return runStartTime_h;
+	}
+	public double getRunEndTime_h() {
+	    return runEndTime_h;
+	}
+	public int getSummerWeekNumber() {
+	    return summerWeekNumber;
+	}
+	public int getWinterWeekNumber() {
+	    return winterWeekNumber;
+	}
+	public double getStartOfSummerWeek_h() {
+	    return startOfSummerWeek_h;
+	}
+	public double getStartOfWinterWeek_h() {
+	    return startOfWinterWeek_h;
+	}
+	
+	@Override
+	public String toString() {
+	    return "J_TimeParameters{" +
+	            "timeStep_h=" + timeStep_h +
+	            ", startYear=" + startYear +
+	            ", hourOfYearPerMonth=" + java.util.Arrays.toString(hourOfYearPerMonth) +
+	            ", dayOfWeek1jan=" + dayOfWeek1jan +
+	            ", runStartTime_h=" + runStartTime_h +
+	            ", runEndTime_h=" + runEndTime_h +
+	            ", summerWeekNumber=" + summerWeekNumber +
+	            ", winterWeekNumber=" + winterWeekNumber +
+	            ", startOfSummerWeek_h=" + startOfSummerWeek_h +
+	            ", startOfWinterWeek_h=" + startOfWinterWeek_h +
+	            '}';
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_TimeVariables.java b/_alp/Classes/Class.J_TimeVariables.java
new file mode 100644
index 0000000..1ca2964
--- /dev/null
+++ b/_alp/Classes/Class.J_TimeVariables.java
@@ -0,0 +1,125 @@
+/**
+ * J_TimeVariables
+ */	
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+//import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@JsonAutoDetect(
+	    fieldVisibility = Visibility.ANY,    // also stores full profiles to file. Maybe arrange a way to 'skip' this?
+	    getterVisibility = Visibility.NONE,
+	    isGetterVisibility = Visibility.NONE,
+	    setterVisibility = Visibility.NONE,
+	    creatorVisibility = Visibility.NONE
+	)
+	@JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
+
+public final class J_TimeVariables {
+	////Time Variables -> Updated every timestep
+	private double t_h; //Current energymodel runtime: t_h = 0, corresponds to 'jan 1 0:00' of the start year 
+	private double anyLogicTime_h; // anyLogicTime is the experiment time used for DataSets/ResultsUI. t = 0 corresponds to the start of the simulation
+	private double timeOfDay_h;
+	private double timeStepsElapsed;
+
+	private OL_Days dayOfWeek;
+	
+	private boolean isDaytime;
+	private boolean isWeekday;
+	private boolean isSummerWeek;
+	private boolean isWinterWeek;
+	private boolean isLastTimeStepOfDay;
+	
+	/**
+     * Default constructor
+     */
+	public J_TimeVariables() {
+		
+	}
+	
+	public J_TimeVariables(int v_timeStepsElapsed, J_TimeParameters timeParameters){
+		updateTimeVariables(v_timeStepsElapsed, timeParameters);
+	}
+	
+	public void updateTimeVariables(int v_timeStepsElapsed, J_TimeParameters timeParameters) {
+		timeStepsElapsed = v_timeStepsElapsed;
+		anyLogicTime_h = timeStepsElapsed * timeParameters.getTimeStep_h();
+		t_h = anyLogicTime_h + timeParameters.getRunStartTime_h();
+		int dayIndex = (int) ((t_h / 24 + timeParameters.getDayOfWeek1jan()) % 7);	
+		dayOfWeek = OL_Days.values()[dayIndex];
+		isDaytime = t_h % 24 > 6 && t_h % 24 < 18;
+		isWeekday = (t_h+(timeParameters.getDayOfWeek1jan()-1)*24) % (24*7) < (24*5);
+		isSummerWeek = (t_h % 8760) >= timeParameters.getStartOfSummerWeek_h() && (t_h % 8760) < timeParameters.getStartOfSummerWeek_h() + 24*7;
+		isWinterWeek = (t_h % 8760) >= timeParameters.getStartOfWinterWeek_h() && (t_h % 8760) < timeParameters.getStartOfWinterWeek_h() + 24*7;
+		isLastTimeStepOfDay = t_h % 24 == (24-timeParameters.getTimeStep_h());
+		timeOfDay_h = t_h % 24;
+	}
+	
+	public double getT_h() {
+	    return t_h;
+	}
+	
+	public double getAnyLogicTime_h() {
+		return anyLogicTime_h;
+	}
+
+	public double getTimeOfDay_h() {
+	    return timeOfDay_h;
+	}
+
+	public OL_Days getDayOfWeek() {
+		return dayOfWeek;
+	}
+	
+	public double getTimeStepsElapsed() {
+	    return timeStepsElapsed;
+	}
+
+	public boolean isDaytime() {
+	    return isDaytime;
+	}
+
+	public boolean isWeekday() {
+	    return isWeekday;
+	}
+
+	public boolean isSummerWeek() {
+	    return isSummerWeek;
+	}
+
+	public boolean isWinterWeek() {
+	    return isWinterWeek;
+	}
+
+	public boolean isLastTimeStepOfDay() {
+	    return isLastTimeStepOfDay;
+	}
+	
+	public Date getDate(Experiment experiment, J_TimeParameters timeParameters) {
+		Date startDate = experiment.getEngine().getStartDate();
+		long startDateUnixTime_ms = startDate.getTime();
+		long runtime_ms = (long) (timeStepsElapsed * timeParameters.getTimeStep_h() * 60 * 60 * 1000);
+		Date date = new Date();
+		date.setTime(startDateUnixTime_ms + runtime_ms);
+		return date;
+	}
+	
+	
+	@Override
+	public String toString() {
+	    return "J_TimeVariables{" +
+	            "t_h=" + t_h +
+	            ", anyLogicTime_h=" + anyLogicTime_h +
+	            ", timeOfDay_h=" + timeOfDay_h +
+	            ", timeStepsElapsed=" + timeStepsElapsed +
+	            ", dayOfWeek=" + dayOfWeek +
+	            ", isDaytime=" + isDaytime +
+	            ", isWeekday=" + isWeekday +
+	            ", isSummerWeek=" + isSummerWeek +
+	            ", isWinterWeek=" + isWinterWeek +
+	            ", isLastTimeStepOfDay=" + isLastTimeStepOfDay +
+	            '}';
+	}
+}
\ No newline at end of file

From 798c6a117cf5b5289c6607a89fe35f01751e8096 Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Tue, 10 Feb 2026 16:49:47 +0100
Subject: [PATCH 3/3] adding of annotations to chargingsession classes to fix
 save load issues

---
 _alp/Classes/Class.J_ChargePoint.java         |  9 ++++++--
 _alp/Classes/Class.J_ChargingSessionData.java | 23 ++++++++++++++++++-
 _alp/Classes/Class.J_EAChargingSession.java   |  8 ++++++-
 ...tingManagementPIcontrolHybridHeatpump.java |  3 +++
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/_alp/Classes/Class.J_ChargePoint.java b/_alp/Classes/Class.J_ChargePoint.java
index 62a1ca5..c14e4c0 100644
--- a/_alp/Classes/Class.J_ChargePoint.java
+++ b/_alp/Classes/Class.J_ChargePoint.java
@@ -3,6 +3,9 @@
  */	
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+
 @JsonAutoDetect(
     fieldVisibility = Visibility.ANY,    // 
     getterVisibility = Visibility.NONE,
@@ -10,6 +13,7 @@
     setterVisibility = Visibility.NONE,
     creatorVisibility = Visibility.NONE
 )
+@JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 
 public class J_ChargePoint implements I_ChargePointRegistration{
 	
@@ -25,9 +29,10 @@ public class J_ChargePoint implements I_ChargePointRegistration{
 
 	private List<I_ChargingRequest> storedActiveChargingRequests = null;
 
-	//Constructor for (de-)serialisation
+    /**
+     * Constructor for (de-)serialisation
+     */
 	public J_ChargePoint() {
-		
 	};
 	
 	/**
diff --git a/_alp/Classes/Class.J_ChargingSessionData.java b/_alp/Classes/Class.J_ChargingSessionData.java
index 24e9952..a5ecd8b 100644
--- a/_alp/Classes/Class.J_ChargingSessionData.java
+++ b/_alp/Classes/Class.J_ChargingSessionData.java
@@ -1,6 +1,21 @@
 /**
  * J_ChargingSessionData
  */	
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,    // 
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+@JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
+
 public class J_ChargingSessionData {
 	private double startTime_h;
 	private double endTime_h;
@@ -18,7 +33,13 @@ public class J_ChargingSessionData {
 	private boolean V2GCapableOverride = true;
 	
     /**
-     * Default constructor
+     * Constructor for (de-)serialisation
+     */
+	public J_ChargingSessionData() {
+	}
+	
+    /**
+     * Default constructor initializing the fields
      */
     public J_ChargingSessionData(double startTime_quarterhours, double endTime_quarterhours, double chargingDemand_kWh, double batterySize_kWh, double chargingPower_kW, int socketNb, boolean V2GCapable, double timeStep_h) {
     
diff --git a/_alp/Classes/Class.J_EAChargingSession.java b/_alp/Classes/Class.J_EAChargingSession.java
index 8bd7589..4bea6ac 100644
--- a/_alp/Classes/Class.J_EAChargingSession.java
+++ b/_alp/Classes/Class.J_EAChargingSession.java
@@ -36,8 +36,14 @@ public class J_EAChargingSession extends zero_engine.J_EAFlex implements I_Charg
 	private int storedNextSessionIndex;	
 	
     /**
-     * Default constructor
+     * Constructor for (de-)serialisation
      */
+	public J_EAChargingSession() {
+	}
+	
+    /**
+     * Default constructor initializing the fields
+     */	
 	public J_EAChargingSession(I_AssetOwner owner, List<J_ChargingSessionData> chargingSessionDataList, int socketNb, J_TimeParameters timeParameters) {
 		this.setOwner(owner);	
 		this.timeParameters = timeParameters;
diff --git a/_alp/Classes/Class.J_HeatingManagementPIcontrolHybridHeatpump.java b/_alp/Classes/Class.J_HeatingManagementPIcontrolHybridHeatpump.java
index 3328050..bdb8fd3 100644
--- a/_alp/Classes/Class.J_HeatingManagementPIcontrolHybridHeatpump.java
+++ b/_alp/Classes/Class.J_HeatingManagementPIcontrolHybridHeatpump.java
@@ -3,6 +3,8 @@
  */	
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 @JsonAutoDetect(
     fieldVisibility = Visibility.ANY,    // 
@@ -12,6 +14,7 @@
     creatorVisibility = Visibility.NONE
 )
 
+@JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 public class J_HeatingManagementPIcontrolHybridHeatpump implements I_HeatingManagement{
 	private boolean isInitialized = false;
 	private GridConnection gc;