diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index 1b452e7b..225734ef 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -1881,6 +1881,11 @@
 				<Name><![CDATA[J_HeatingManagementSimple]]></Name>
 				<Folder>1753194088788</Folder>
 			</JavaClass>
+			<JavaClass>
+				<Id>1754578019724</Id>
+				<Name><![CDATA[I_HeatingAsset]]></Name>
+				<Folder>1752677832758</Folder>
+			</JavaClass>
 		</JavaClasses>
 		<RequiredLibraryReference>
 			<LibraryName>com.anylogic.libraries.modules.markup_descriptors</LibraryName>
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index b6d21ff6..5d22bb6c 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -473,6 +473,13 @@
 energyModel.c_energyAssets.add(j_ea);
 c_energyAssets.add(j_ea);
 
+if (j_ea instanceof I_HeatingAsset) {
+	c_heatingAssets.add((J_EAConversion)j_ea);
+	if (p_heatingManagement != null) {
+		p_heatingManagement.notInitialized();
+	}
+}
+
 if (j_ea instanceof J_EAVehicle) {
 	J_EAVehicle vehicle = (J_EAVehicle)j_ea;
 	if (vehicle instanceof J_EADieselVehicle) {
@@ -512,10 +519,6 @@
 	if (j_ea.energyAssetType == OL_EnergyAssetType.HOT_WATER_CONSUMPTION) {
 		p_DHWAsset = (J_EAConsumption)j_ea;	
 	}
-	if( j_ea.energyAssetType == OL_EnergyAssetType.ELECTRICITY_DEMAND ) {
-	}
-	if( j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB ) {
-	}
 } else if (j_ea instanceof J_EAProduction) {
 	c_productionAssets.add((J_EAProduction)j_ea);
 
@@ -544,29 +547,15 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 	}
 } else if (j_ea instanceof J_EAConversion) {
 	c_conversionAssets.add((J_EAConversion)j_ea);
-	// Non Heating Assets
 	if ( j_ea.energyAssetType == OL_EnergyAssetType.GAS_PIT || j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB){
-		if (j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB) {
-		}
 		if (p_cookingTracker == null) {
 			int rowIndex = uniform_discr(2, 300); 
 			p_cookingTracker = new J_ActivityTrackerCooking(energyModel.p_cookingPatternCsv, rowIndex, (energyModel.t_h-energyModel.p_runStartTime_h)*60, (J_EAConversion)j_ea );			
 		} else {
 			p_cookingTracker.HOB = (J_EAConversion)j_ea;
 		}
-	} else if (j_ea instanceof J_EAConversionElectrolyser) {
-		//c_electrolyserAssets.add(j_ea);
-	} else {
-		// Heating Assets
-		c_heatingAssets.add((J_EAConversion)j_ea);
-		if (p_heatingManagement != null) {
-			p_heatingManagement.notInitialized();
-		}
-		// Special Heating Assets
-		if (j_ea instanceof J_EAConversionHeatPump) {
-			energyModel.c_ambientDependentAssets.add(j_ea);
-		} else if (j_ea instanceof J_EAConversionGasCHP) {
-		}
+	} else if (j_ea instanceof J_EAConversionHeatPump) {
+		energyModel.c_ambientDependentAssets.add(j_ea);
 	}
 } else if  (j_ea instanceof J_EAStorage) {
 	c_storageAssets.add((J_EAStorage)j_ea);
diff --git a/_alp/Classes/Class.I_HeatingAsset.java b/_alp/Classes/Class.I_HeatingAsset.java
new file mode 100644
index 00000000..46fad080
--- /dev/null
+++ b/_alp/Classes/Class.I_HeatingAsset.java
@@ -0,0 +1,4 @@
+public interface I_HeatingAsset
+{
+
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_EAConversionElectricHeater.java b/_alp/Classes/Class.J_EAConversionElectricHeater.java
index dcb1714a..69c3f2cc 100644
--- a/_alp/Classes/Class.J_EAConversionElectricHeater.java
+++ b/_alp/Classes/Class.J_EAConversionElectricHeater.java
@@ -1,7 +1,7 @@
 /**
  * J_EAConversionElectricHeater
  */
-public class J_EAConversionElectricHeater extends J_EAConversion implements Serializable {
+public class J_EAConversionElectricHeater extends J_EAConversion implements Serializable, I_HeatingAsset {
 
 	protected double outputTemperature_degC;
     /**
diff --git a/_alp/Classes/Class.J_EAConversionGasBurner.java b/_alp/Classes/Class.J_EAConversionGasBurner.java
index abeb4774..0bd6d780 100644
--- a/_alp/Classes/Class.J_EAConversionGasBurner.java
+++ b/_alp/Classes/Class.J_EAConversionGasBurner.java
@@ -1,7 +1,7 @@
 /**
  * J_EAConversionGasBurner
  */
-public class J_EAConversionGasBurner extends zero_engine.J_EAConversion implements Serializable {
+public class J_EAConversionGasBurner extends zero_engine.J_EAConversion implements Serializable, I_HeatingAsset {
 
 	protected double outputTemperature_degC;
 
diff --git a/_alp/Classes/Class.J_EAConversionGasCHP.java b/_alp/Classes/Class.J_EAConversionGasCHP.java
index 68d8adcf..3077c347 100644
--- a/_alp/Classes/Class.J_EAConversionGasCHP.java
+++ b/_alp/Classes/Class.J_EAConversionGasCHP.java
@@ -1,7 +1,7 @@
 /**
  * J_EAConversionGasCHP
  */
-public class J_EAConversionGasCHP extends zero_engine.J_EAConversion implements Serializable {
+public class J_EAConversionGasCHP extends zero_engine.J_EAConversion implements Serializable, I_HeatingAsset {
 
 	protected double outputTemperature_degC;
 	protected double outputHeatCapacity_kW;
diff --git a/_alp/Classes/Class.J_EAConversionHeatDeliverySet.java b/_alp/Classes/Class.J_EAConversionHeatDeliverySet.java
index 625396db..212cd771 100644
--- a/_alp/Classes/Class.J_EAConversionHeatDeliverySet.java
+++ b/_alp/Classes/Class.J_EAConversionHeatDeliverySet.java
@@ -1,7 +1,7 @@
 /**
  * J_EAConversionHeatDeliverySet
  */
-public class J_EAConversionHeatDeliverySet extends zero_engine.J_EAConversion implements Serializable {
+public class J_EAConversionHeatDeliverySet extends zero_engine.J_EAConversion implements Serializable, I_HeatingAsset {
 
 	protected double outputTemperature_degC;
     /**
diff --git a/_alp/Classes/Class.J_EAConversionHeatPump.java b/_alp/Classes/Class.J_EAConversionHeatPump.java
index 27d2feec..8ad74fc9 100644
--- a/_alp/Classes/Class.J_EAConversionHeatPump.java
+++ b/_alp/Classes/Class.J_EAConversionHeatPump.java
@@ -1,7 +1,7 @@
 /**
  * J_EAConversionHeatPump
  */
-public class J_EAConversionHeatPump extends zero_engine.J_EAConversion implements Serializable {
+public class J_EAConversionHeatPump extends zero_engine.J_EAConversion implements Serializable, I_HeatingAsset {
 	private double COP_r;
 	private double belowZeroHeatpumpEtaReductionFactor;
 	protected double outputTemperature_degC;
diff --git a/_alp/Classes/Class.J_EAConversionHydrogenBurner.java b/_alp/Classes/Class.J_EAConversionHydrogenBurner.java
index a1d86785..a342ab22 100644
--- a/_alp/Classes/Class.J_EAConversionHydrogenBurner.java
+++ b/_alp/Classes/Class.J_EAConversionHydrogenBurner.java
@@ -1,7 +1,7 @@
 /**
 * J_EAConversionGasBurner
 */
-public class J_EAConversionHydrogenBurner extends zero_engine.J_EAConversion implements Serializable {
+public class J_EAConversionHydrogenBurner extends zero_engine.J_EAConversion implements Serializable, I_HeatingAsset {
  
 	protected double outputTemperature_degC;
     /**
diff --git a/_alp/Classes/Class.J_EAEV.java b/_alp/Classes/Class.J_EAEV.java
index a327a48d..4858cf02 100644
--- a/_alp/Classes/Class.J_EAEV.java
+++ b/_alp/Classes/Class.J_EAEV.java
@@ -127,7 +127,7 @@ public boolean startTrip() {
 			traceln("Trip not started because EV not available!");
 			return false; // Trip not started because EV not available!
 		}
-	}
+	}	
  
 	@Override
 	public boolean endTrip(double tripDist_km) {
diff --git a/_alp/Classes/Class.J_HeatingManagementNeighborhood.java b/_alp/Classes/Class.J_HeatingManagementNeighborhood.java
index af2d5dc1..b6ddd567 100644
--- a/_alp/Classes/Class.J_HeatingManagementNeighborhood.java
+++ b/_alp/Classes/Class.J_HeatingManagementNeighborhood.java
@@ -182,7 +182,7 @@ public void initializeAssets() {
     	heatDeliverySet = null;
     	hydrogenBurner = null;
     	
-    	for (J_EAConversion heatingAsset : gc.c_heatingAssets) {
+    	for (J_EA heatingAsset : gc.c_heatingAssets) {
     		if (heatingAsset instanceof J_EAConversionGasBurner) {
     			if (gasBurner != null) {
     	    		throw new RuntimeException(this.getClass() + " does not support two gasburners");