diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index 827943f0..c22c2c41 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -398,36 +398,28 @@
 			</OptionList>
 			<OptionList>
 				<Id>1659701773383</Id>
-				<Name><![CDATA[OL_AreaType]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
-				<Option>
-					<Id>1659701782496</Id>
-					<Name><![CDATA[NEIGHBORHOOD]]></Name>
-				</Option>
-				<Option>
-					<Id>1659701773953</Id>
-					<Name><![CDATA[RES]]></Name>
-				</Option>
+				<Name><![CDATA[OL_PBL_OwnershipType]]></Name>
+				<Description><![CDATA[OwnershipType: 
+0: Koop
+1: Particulier Huur
+2: Sociale Huur]]></Description>
 				<Option>
-					<Id>1659701788868</Id>
-					<Name><![CDATA[INDUSTRY]]></Name>
+					<Id>1768317131071</Id>
+					<Name><![CDATA[TYPE_0]]></Name>
 				</Option>
 				<Option>
-					<Id>1659701795639</Id>
-					<Name><![CDATA[BUSINESS]]></Name>
+					<Id>1768317109568</Id>
+					<Name><![CDATA[TYPE_1]]></Name>
 				</Option>
 				<Option>
-					<Id>1697466302695</Id>
-					<Name><![CDATA[HVTRANSFORMER]]></Name>
-				</Option>
-				<Option>
-					<Id>1713426522585</Id>
-					<Name><![CDATA[PARCEL]]></Name>
+					<Id>1768317127860</Id>
+					<Name><![CDATA[TYPE_2]]></Name>
 				</Option>
 			</OptionList>
 			<OptionList>
 				<Id>1659711659517</Id>
 				<Name><![CDATA[OL_BuildingType]]></Name>
+				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<Option>
 					<Id>1659711661606</Id>
 					<Name><![CDATA[House]]></Name>
@@ -453,43 +445,6 @@
 					<Name><![CDATA[Other]]></Name>
 				</Option>
 			</OptionList>
-			<OptionList>
-				<Id>1660226249511</Id>
-				<Name><![CDATA[OL_ActorType]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
-				<Option>
-					<Id>1660226249512</Id>
-					<Name><![CDATA[CONNECTIONOWNER]]></Name>
-				</Option>
-				<Option>
-					<Id>1660226249513</Id>
-					<Name><![CDATA[GOV]]></Name>
-				</Option>
-				<Option>
-					<Id>1660226249514</Id>
-					<Name><![CDATA[SUPPLIERENERGY]]></Name>
-				</Option>
-				<Option>
-					<Id>1660226249515</Id>
-					<Name><![CDATA[COOPENERGY]]></Name>
-				</Option>
-				<Option>
-					<Id>1660577544099</Id>
-					<Name><![CDATA[OPERATORGRID]]></Name>
-				</Option>
-				<Option>
-					<Id>1692796172966</Id>
-					<Name><![CDATA[GOVHOLON]]></Name>
-				</Option>
-				<Option>
-					<Id>1703256179429</Id>
-					<Name><![CDATA[SUBTENANT]]></Name>
-				</Option>
-				<Option>
-					<Id>1717960308322</Id>
-					<Name><![CDATA[CPO]]></Name>
-				</Option>
-			</OptionList>
 			<OptionList>
 				<Id>1660743989498</Id>
 				<Name><![CDATA[OL_ContractType]]></Name>
@@ -624,7 +579,7 @@
 			</OptionList>
 			<OptionList>
 				<Id>1665487983362</Id>
-				<Name><![CDATA[OL_GridConnectionIsolationLabel]]></Name>
+				<Name><![CDATA[OL_GridConnectionInsulationLabel]]></Name>
 				<Option>
 					<Id>1665487983978</Id>
 					<Name><![CDATA[A]]></Name>
@@ -1100,6 +1055,81 @@
 					<Name><![CDATA[TRACTOR]]></Name>
 				</Option>
 			</OptionList>
+			<OptionList>
+				<Id>1768309588451</Id>
+				<Name><![CDATA[OL_PBL_BuildingType]]></Name>
+				<Description><![CDATA[PBL BuildingType: 
+1: vrijstaand
+2: 2-onder-1 kap
+3: rijwoning hoekwoning
+4: rijwoning tussenwoning
+5: appartementen t/m 4 (meergezinswoningen t/m 4 verdiepingen)
+6: appartementen 5>= (meergezinswoningen 5 of meer verdiepingen)]]></Description>
+				<Option>
+					<Id>1768309847959</Id>
+					<Name><![CDATA[TYPE_1]]></Name>
+				</Option>
+				<Option>
+					<Id>1768309856061</Id>
+					<Name><![CDATA[TYPE_2]]></Name>
+				</Option>
+				<Option>
+					<Id>1768309858840</Id>
+					<Name><![CDATA[TYPE_3]]></Name>
+				</Option>
+				<Option>
+					<Id>1768309924957</Id>
+					<Name><![CDATA[TYPE_4]]></Name>
+				</Option>
+				<Option>
+					<Id>1768309929674</Id>
+					<Name><![CDATA[TYPE_5]]></Name>
+				</Option>
+				<Option>
+					<Id>1768309931760</Id>
+					<Name><![CDATA[TYPE_6]]></Name>
+				</Option>
+			</OptionList>
+			<OptionList>
+				<Id>1768384843601</Id>
+				<Name><![CDATA[OL_GridConnectionEnergyLabel]]></Name>
+				<Option>
+					<Id>1768384856548</Id>
+					<Name><![CDATA[A]]></Name>
+				</Option>
+				<Option>
+					<Id>1768384856549</Id>
+					<Name><![CDATA[B]]></Name>
+				</Option>
+				<Option>
+					<Id>1768384856550</Id>
+					<Name><![CDATA[C]]></Name>
+				</Option>
+				<Option>
+					<Id>1768384856551</Id>
+					<Name><![CDATA[D]]></Name>
+				</Option>
+				<Option>
+					<Id>1768384856552</Id>
+					<Name><![CDATA[E]]></Name>
+				</Option>
+				<Option>
+					<Id>1768384856553</Id>
+					<Name><![CDATA[F]]></Name>
+				</Option>
+				<Option>
+					<Id>1768384856554</Id>
+					<Name><![CDATA[G]]></Name>
+				</Option>
+				<Option>
+					<Id>1768384856555</Id>
+					<Name><![CDATA[NONE]]></Name>
+				</Option>
+				<Option>
+					<Id>1768384856556</Id>
+					<Name><![CDATA[UNKNOWN]]></Name>
+				</Option>
+			</OptionList>
 		</OptionLists>
 		<Folders>
 			<Folder>
@@ -1829,6 +1859,11 @@
 				<Name><![CDATA[J_ChargingSessionData]]></Name>
 				<Folder>1752680962144</Folder>
 			</JavaClass>
+			<JavaClass>
+				<Id>1768309433547</Id>
+				<Name><![CDATA[J_PBLParameters]]></Name>
+				<Folder>1752680962144</Folder>
+			</JavaClass>
 		</JavaClasses>
 		<RequiredLibraryReference>
 			<LibraryName>com.anylogic.libraries.modules.markup_descriptors</LibraryName>
diff --git a/_alp/Agents/EnergyModel/EmbeddedObjects.xml b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
index e3879f08..80a74d4a 100644
--- a/_alp/Agents/EnergyModel/EmbeddedObjects.xml
+++ b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
@@ -176,7 +176,7 @@
 				<Name><![CDATA[p_cookingTracker]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_energyLabel]]></Name>
+				<Name><![CDATA[p_insulationLabel]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_DHWAsset]]></Name>
@@ -223,6 +223,9 @@
 			<Parameter>
 				<Name><![CDATA[v_isActive]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_energyLabel]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -931,7 +934,7 @@
 				<Name><![CDATA[p_cookingTracker]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_energyLabel]]></Name>
+				<Name><![CDATA[p_insulationLabel]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_DHWAsset]]></Name>
@@ -982,7 +985,7 @@
 				<Name><![CDATA[p_smartChargingPowerAttenuation_fr]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_bouwjaar]]></Name>
+				<Name><![CDATA[p_buildYear]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_eigenOprit]]></Name>
@@ -1006,22 +1009,10 @@
 				<Name><![CDATA[v_isActive]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_buildingType_heatingPBL]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_ownership_heatingPBL]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_constructionPeriod_heatingPBL]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_localFactor_heatingPBL]]></Name>
+				<Name><![CDATA[p_PBLParameters]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_regionalClimateCorrectionFactor_heatingPBL]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_schillabel_heatingPBL]]></Name>
+				<Name><![CDATA[p_energyLabel]]></Name>
 			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
@@ -1108,7 +1099,7 @@
 				<Name><![CDATA[p_cookingTracker]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_energyLabel]]></Name>
+				<Name><![CDATA[p_insulationLabel]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_DHWAsset]]></Name>
@@ -1164,6 +1155,9 @@
 			<Parameter>
 				<Name><![CDATA[v_isActive]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_energyLabel]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -1249,7 +1243,7 @@
 				<Name><![CDATA[p_cookingTracker]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_energyLabel]]></Name>
+				<Name><![CDATA[p_insulationLabel]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_DHWAsset]]></Name>
@@ -1299,6 +1293,9 @@
 			<Parameter>
 				<Name><![CDATA[v_isActive]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_energyLabel]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -1387,7 +1384,7 @@
 				<Name><![CDATA[p_cookingTracker]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_energyLabel]]></Name>
+				<Name><![CDATA[p_insulationLabel]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_DHWAsset]]></Name>
@@ -1488,6 +1485,9 @@
 			<Parameter>
 				<Name><![CDATA[v_isActive]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_energyLabel]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -1576,7 +1576,7 @@
 				<Name><![CDATA[p_cookingTracker]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_energyLabel]]></Name>
+				<Name><![CDATA[p_insulationLabel]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_DHWAsset]]></Name>
@@ -1620,6 +1620,9 @@
 			<Parameter>
 				<Name><![CDATA[v_isActive]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_energyLabel]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -1705,7 +1708,7 @@
 				<Name><![CDATA[p_cookingTracker]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_energyLabel]]></Name>
+				<Name><![CDATA[p_insulationLabel]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_DHWAsset]]></Name>
@@ -1755,6 +1758,9 @@
 			<Parameter>
 				<Name><![CDATA[v_isActive]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_energyLabel]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -2173,7 +2179,7 @@
 				<Name><![CDATA[p_cookingTracker]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_energyLabel]]></Name>
+				<Name><![CDATA[p_insulationLabel]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_DHWAsset]]></Name>
@@ -2259,6 +2265,9 @@
 			<Parameter>
 				<Name><![CDATA[v_isActive]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_energyLabel]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -2348,7 +2357,7 @@
 				<Name><![CDATA[p_cookingTracker]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_energyLabel]]></Name>
+				<Name><![CDATA[p_insulationLabel]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_DHWAsset]]></Name>
@@ -2428,6 +2437,9 @@
 			<Parameter>
 				<Name><![CDATA[v_isActive]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_energyLabel]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
diff --git a/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml b/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
index a9a5f172..f11ff11e 100644
--- a/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
+++ b/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
@@ -37,7 +37,7 @@
 			<Name><![CDATA[p_cookingTracker]]></Name>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[p_energyLabel]]></Name>
+			<Name><![CDATA[p_insulationLabel]]></Name>
 		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_DHWAsset]]></Name>
@@ -84,6 +84,9 @@
 		<Parameter>
 			<Name><![CDATA[v_isActive]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_energyLabel]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml b/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
index 872ecc2f..3e910def 100644
--- a/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
+++ b/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
@@ -41,7 +41,7 @@
 			<Name><![CDATA[p_cookingTracker]]></Name>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[p_energyLabel]]></Name>
+			<Name><![CDATA[p_insulationLabel]]></Name>
 		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_DHWAsset]]></Name>
@@ -85,6 +85,9 @@
 		<Parameter>
 			<Name><![CDATA[v_isActive]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_energyLabel]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml b/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
index 826b149f..4fc9fb85 100644
--- a/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
+++ b/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
@@ -37,7 +37,7 @@
 			<Name><![CDATA[p_cookingTracker]]></Name>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[p_energyLabel]]></Name>
+			<Name><![CDATA[p_insulationLabel]]></Name>
 		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_DHWAsset]]></Name>
@@ -84,6 +84,9 @@
 		<Parameter>
 			<Name><![CDATA[v_isActive]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_energyLabel]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml b/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
index d6f2f45d..5d3e3db5 100644
--- a/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
+++ b/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
@@ -37,7 +37,7 @@
 			<Name><![CDATA[p_cookingTracker]]></Name>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[p_energyLabel]]></Name>
+			<Name><![CDATA[p_insulationLabel]]></Name>
 		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_DHWAsset]]></Name>
@@ -84,6 +84,9 @@
 		<Parameter>
 			<Name><![CDATA[v_isActive]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_energyLabel]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCHouse/AOC.GCHouse.xml b/_alp/Agents/GCHouse/AOC.GCHouse.xml
index ed81c7d7..99fbf5f3 100644
--- a/_alp/Agents/GCHouse/AOC.GCHouse.xml
+++ b/_alp/Agents/GCHouse/AOC.GCHouse.xml
@@ -37,7 +37,7 @@
 			<Name><![CDATA[p_cookingTracker]]></Name>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[p_energyLabel]]></Name>
+			<Name><![CDATA[p_insulationLabel]]></Name>
 		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_DHWAsset]]></Name>
@@ -84,6 +84,9 @@
 		<Parameter>
 			<Name><![CDATA[v_isActive]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_energyLabel]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCHouse/Variables.xml b/_alp/Agents/GCHouse/Variables.xml
index 83d57c30..72f1f48e 100644
--- a/_alp/Agents/GCHouse/Variables.xml
+++ b/_alp/Agents/GCHouse/Variables.xml
@@ -227,9 +227,9 @@
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1717323052486</Id>
-		<Name><![CDATA[p_bouwjaar]]></Name>
+		<Name><![CDATA[p_buildYear]]></Name>
 		<X>50</X>
-		<Y>510</Y>
+		<Y>540</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -254,7 +254,7 @@
 		<Id>1722350833847</Id>
 		<Name><![CDATA[p_eigenOprit]]></Name>
 		<X>50</X>
-		<Y>530</Y>
+		<Y>560</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -279,7 +279,7 @@
 		<Id>1726685123865</Id>
 		<Name><![CDATA[p_cookingMethod]]></Name>
 		<X>250</X>
-		<Y>510</Y>
+		<Y>540</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -387,135 +387,10 @@
 		</Properties>
 	</Variable>
 	<Variable Class="Parameter">
-		<Id>1765292486713</Id>
-		<Name><![CDATA[p_buildingType_heatingPBL]]></Name>
-		<X>-300</X>
-		<Y>50</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[int]]></Type>
-			<UnitType>NONE</UnitType>
-			<SdArray>false</SdArray>
-			<ParameterEditor>
-				<Id>1765292486711</Id>
-				<EditorContolType>TEXT_BOX</EditorContolType>
-				<MinSliderValue>0</MinSliderValue>
-				<MaxSliderValue>100</MaxSliderValue>
-				<DelimeterType>NO_DELIMETER</DelimeterType>
-			</ParameterEditor>
-		</Properties>
-	</Variable>
-	<Variable Class="Parameter">
-		<Id>1765292501616</Id>
-		<Name><![CDATA[p_ownership_heatingPBL]]></Name>
-		<X>-300</X>
-		<Y>70</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[int]]></Type>
-			<UnitType>NONE</UnitType>
-			<SdArray>false</SdArray>
-			<ParameterEditor>
-				<Id>1765292501614</Id>
-				<EditorContolType>TEXT_BOX</EditorContolType>
-				<MinSliderValue>0</MinSliderValue>
-				<MaxSliderValue>100</MaxSliderValue>
-				<DelimeterType>NO_DELIMETER</DelimeterType>
-			</ParameterEditor>
-		</Properties>
-	</Variable>
-	<Variable Class="Parameter">
-		<Id>1765292517522</Id>
-		<Name><![CDATA[p_constructionPeriod_heatingPBL]]></Name>
-		<X>-300</X>
-		<Y>90</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[int]]></Type>
-			<UnitType>NONE</UnitType>
-			<SdArray>false</SdArray>
-			<ParameterEditor>
-				<Id>1765292517520</Id>
-				<EditorContolType>TEXT_BOX</EditorContolType>
-				<MinSliderValue>0</MinSliderValue>
-				<MaxSliderValue>100</MaxSliderValue>
-				<DelimeterType>NO_DELIMETER</DelimeterType>
-			</ParameterEditor>
-		</Properties>
-	</Variable>
-	<Variable Class="Parameter">
-		<Id>1765292532994</Id>
-		<Name><![CDATA[p_localFactor_heatingPBL]]></Name>
-		<X>-300</X>
-		<Y>130</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[double]]></Type>
-			<UnitType>NONE</UnitType>
-			<SdArray>false</SdArray>
-			<ParameterEditor>
-				<Id>1765292532992</Id>
-				<EditorContolType>TEXT_BOX</EditorContolType>
-				<MinSliderValue>0</MinSliderValue>
-				<MaxSliderValue>100</MaxSliderValue>
-				<DelimeterType>NO_DELIMETER</DelimeterType>
-			</ParameterEditor>
-		</Properties>
-	</Variable>
-	<Variable Class="Parameter">
-		<Id>1765292546817</Id>
-		<Name><![CDATA[p_regionalClimateCorrectionFactor_heatingPBL]]></Name>
-		<X>-300</X>
-		<Y>150</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[double]]></Type>
-			<UnitType>NONE</UnitType>
-			<SdArray>false</SdArray>
-			<ParameterEditor>
-				<Id>1765292546815</Id>
-				<EditorContolType>TEXT_BOX</EditorContolType>
-				<MinSliderValue>0</MinSliderValue>
-				<MaxSliderValue>100</MaxSliderValue>
-				<DelimeterType>NO_DELIMETER</DelimeterType>
-			</ParameterEditor>
-		</Properties>
-	</Variable>
-	<Variable Class="Parameter">
-		<Id>1765357455086</Id>
-		<Name><![CDATA[p_schillabel_heatingPBL]]></Name>
-		<X>-300</X>
-		<Y>110</Y>
+		<Id>1768324597791</Id>
+		<Name><![CDATA[p_PBLParameters]]></Name>
+		<X>50</X>
+		<Y>580</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -524,11 +399,11 @@
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
-			<Type><![CDATA[OL_GridConnectionIsolationLabel]]></Type>
+			<Type><![CDATA[J_PBLParameters]]></Type>
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<ParameterEditor>
-				<Id>1765357455084</Id>
+				<Id>1768324597789</Id>
 				<EditorContolType>TEXT_BOX</EditorContolType>
 				<MinSliderValue>0</MinSliderValue>
 				<MaxSliderValue>100</MaxSliderValue>
diff --git a/_alp/Agents/GCIndustry/AOC.GCIndustry.xml b/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
index 67649c00..417e5fd9 100644
--- a/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
+++ b/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
@@ -38,7 +38,7 @@
 			<Name><![CDATA[p_cookingTracker]]></Name>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[p_energyLabel]]></Name>
+			<Name><![CDATA[p_insulationLabel]]></Name>
 		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_DHWAsset]]></Name>
@@ -85,6 +85,9 @@
 		<Parameter>
 			<Name><![CDATA[v_isActive]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_energyLabel]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml b/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
index 63a7e821..43eb7e2c 100644
--- a/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
+++ b/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
@@ -40,7 +40,7 @@
 			<Name><![CDATA[p_cookingTracker]]></Name>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[p_energyLabel]]></Name>
+			<Name><![CDATA[p_insulationLabel]]></Name>
 		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_DHWAsset]]></Name>
@@ -84,6 +84,9 @@
 		<Parameter>
 			<Name><![CDATA[v_isActive]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_energyLabel]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml b/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
index 03d06c37..6a824ff2 100644
--- a/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
+++ b/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
@@ -40,7 +40,7 @@
 			<Name><![CDATA[p_cookingTracker]]></Name>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[p_energyLabel]]></Name>
+			<Name><![CDATA[p_insulationLabel]]></Name>
 		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_DHWAsset]]></Name>
@@ -84,6 +84,9 @@
 		<Parameter>
 			<Name><![CDATA[v_isActive]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_energyLabel]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCUtility/AOC.GCUtility.xml b/_alp/Agents/GCUtility/AOC.GCUtility.xml
index edd036c3..153fa521 100644
--- a/_alp/Agents/GCUtility/AOC.GCUtility.xml
+++ b/_alp/Agents/GCUtility/AOC.GCUtility.xml
@@ -40,7 +40,7 @@
 			<Name><![CDATA[p_cookingTracker]]></Name>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[p_energyLabel]]></Name>
+			<Name><![CDATA[p_insulationLabel]]></Name>
 		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_DHWAsset]]></Name>
@@ -84,6 +84,9 @@
 		<Parameter>
 			<Name><![CDATA[v_isActive]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_energyLabel]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GIS_Building/Variables.xml b/_alp/Agents/GIS_Building/Variables.xml
index 92a1d594..f43cd924 100644
--- a/_alp/Agents/GIS_Building/Variables.xml
+++ b/_alp/Agents/GIS_Building/Variables.xml
@@ -53,6 +53,7 @@
 	<Variable Class="Parameter">
 		<Id>1696858052551</Id>
 		<Name><![CDATA[p_buildingType]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>40</X>
 		<Y>300</Y>
 		<Label>
diff --git a/_alp/Agents/GridConnection/Variables.xml b/_alp/Agents/GridConnection/Variables.xml
index 01eafe85..c742cd0a 100644
--- a/_alp/Agents/GridConnection/Variables.xml
+++ b/_alp/Agents/GridConnection/Variables.xml
@@ -857,9 +857,9 @@
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1692890035894</Id>
-		<Name><![CDATA[p_energyLabel]]></Name>
+		<Name><![CDATA[p_insulationLabel]]></Name>
 		<X>50</X>
-		<Y>460</Y>
+		<Y>480</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -868,7 +868,7 @@
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
-			<Type><![CDATA[OL_GridConnectionIsolationLabel]]></Type>
+			<Type><![CDATA[OL_GridConnectionInsulationLabel]]></Type>
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<ParameterEditor>
@@ -1241,6 +1241,31 @@
 			</ParameterEditor>
 		</Properties>
 	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768385125927</Id>
+		<Name><![CDATA[p_energyLabel]]></Name>
+		<X>50</X>
+		<Y>460</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[OL_GridConnectionEnergyLabel]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1768385125925</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>
@@ -1407,7 +1432,7 @@
 		<Id>1704895219414</Id>
 		<Name><![CDATA[c_connectedGISObjects]]></Name>
 		<X>50</X>
-		<Y>490</Y>
+		<Y>520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Classes/Class.J_AVGC_data.java b/_alp/Classes/Class.J_AVGC_data.java
index 731b3f2f..af462ad8 100644
--- a/_alp/Classes/Class.J_AVGC_data.java
+++ b/_alp/Classes/Class.J_AVGC_data.java
@@ -2,52 +2,37 @@
  * J_AVGC_data
  */	
 public class J_AVGC_data implements Serializable {
+	
+	////Averages
+	
+	//Houses
 	public double p_avgHouseGasConsumption_m3_yr;
+	public double p_maxAvgHouseGasConsumptionOffset_m3pa;
 	public double p_avgHouseElectricityConsumption_kWh_yr;
-	public double p_avgEVMaxChargePowerVan_kW;
+	public double p_maxAvgHouseElectricityConsumptionOffset_kWhpa;
+	public double p_avgHousePVInstallationPower_kWp;
 	public double p_avgHouseConnectionCapacity_kW;
 	public OL_GridConnectionHeatingType p_avgHouseHeatingMethod;
 	public double p_avgNrOfCarsPerHouse;
 	public double p_ratioEVHousePersonalCars;
-	public double p_avgEVMaxChargePowerCar_kW;
-	public double p_avgEVMaxChargePowerTruck_kW;
-	public double p_avgEVStorageCar_kWh;
-	public double p_avgEVStorageVan_kWh;
-	public double p_avgHousePVInstallationPower_kWp;
-	public double p_avgEVStorageTruck_kWh;
 	public double p_ratioHouseInstalledPV;
-	public double p_gas_kWhpm3;
-	public double p_diesel_kWhpl;
-	public double p_gasoline_kWhpl;
-	public double p_waterHeatCapacity_JpkgK;
-	public double p_waterDensity_kgpm3;
+	public double p_avgRatioHouseBatteryStorageCapacity_v_PVPower;
+	public double p_avgSpaceHeatingTotalGasConsumptionShare_fr;
+	public double p_avgDHWTotalGasConsumptionShare_fr;
+	public double p_avgCookingTotalGasConsumptionShare_fr;
+	
+	//Utilities
 	public OL_GridConnectionHeatingType p_avgUtilityHeatingMethod;
 	public double p_avgUtilityConnectionCapacity_kW;
 	public double p_avgUtilityPVPower_kWp;
 	public double p_ratioElectricTrucks;
 	public OL_GridConnectionHeatingType p_avgCompanyHeatingMethod;
+	public double p_avgCompanyElectricityConsumption_kWhpm2;
+	public double p_avgCompanyGasConsumption_m3pm2;
+	public double p_avgCompanyHeatConsumption_kWhpm2;
 
-	public double p_hydrogenEnergyDensity_kWh_Nm3;
-	public double p_hydrogenSpecificEnergy_kWh_kg;
-	public double p_hydrogenDensity_kg_Nm3;
-	public double p_oxygenDensity_kg_Nm3;
-	public double p_oxygenProduction_kgO2pkgH2;
-	
-	public double p_avgEVEnergyConsumptionCar_kWhpkm;
-	public double p_avgEVEnergyConsumptionVan_kWhpkm;
-	public double p_avgEVEnergyConsumptionTruck_kWhpkm;	
-	public double p_avgDieselConsumptionCar_kmpl;
-	public double p_avgGasolineConsumptionCar_kmpl;	
-	public double p_avgDieselConsumptionCar_kWhpkm;
-	public double p_avgGasolineConsumptionCar_kWhpkm;
-	public double p_avgDieselConsumptionVan_kmpl;
-	public double p_avgDieselConsumptionVan_kWhpkm;
-	public double p_avgDieselConsumptionTruck_kmpl;
-	public double p_avgDieselConsumptionTruck_kWhpkm;
-	public double p_avgHydrogenConsumptionCar_kWhpkm;
-	public double p_avgHydrogenConsumptionVan_kWhpkm;
-	public double p_avgHydrogenConsumptionTruck_kWhpkm;
 	
+	//Energy assets
 	public double p_avgCOPHeatpump;
 	public double p_avgEfficiencyHeatpump_fr;
 	public double p_avgOutputTemperatureElectricHeatpump_degC;
@@ -70,26 +55,84 @@ public class J_AVGC_data implements Serializable {
 	public double p_avgPVPower_kWpm2;
 	public double p_avgAnnualProductionPV_kWhpWp;
 	public double p_avgRatioRoofPotentialPV;
-	public double p_avgRatioBatteryCapacity_v_Power;
-	public double p_avgRatioHouseBatteryStorageCapacity_v_PVPower;
+
 	public double p_avgSolarFieldPower_kWppha;
+	
 	public double p_avgEfficiencyCHP_thermal_fr;
 	public double p_avgEfficiencyCHP_electric_fr;
 	public double p_avgOutputTemperatureCHP_degC;
 
-	public double p_v1gProbability;
-	public double p_v2gProbability;
-	public int p_avgEVsPerPublicCharger;
 	public double p_avgPTPower_kWpm2;
 	public double p_avgPTPanelSize_m2;
+	
 	public double p_avgMaxHeatBufferTemperature_degC;
 	public double p_avgMinHeatBufferTemperature_degC;
 	public double p_avgHeatBufferWaterVolumePerPTSurface_m3pm2;
 	public double p_avgHeatBufferWaterVolumePerHPPower_m3pkW;
+	
+	public double p_avgRatioBatteryCapacity_v_Power;
+	
+	//Thermal model parametes
+	public double p_PBL_HeatingLossFactor_fr;
+	public Map<OL_GridConnectionInsulationLabel, Double> map_insulationLabel_lossfactorPerFloorSurface_WpKm2;
+	public double p_solarAbsorptionFloorSurfaceScalingFactor_fr;
+	public Map<OL_GridConnectionInsulationLabel, Double> map_insulationLabel_cooldownPeriod_hr;
+	public double p_heatCapacitySizingConstant_JpK;
+	public double p_heatCapacitySizingSlope_JpKm2;
+	public double p_heatCapacitySizingFactor_fr;
+
+	//Vehicles
+	public double p_avgEVMaxChargePowerCar_kW;
+	public double p_avgEVMaxChargePowerVan_kW;
+	public double p_avgEVMaxChargePowerTruck_kW;
+	public double p_avgEVStorageCar_kWh;
+	public double p_avgEVStorageVan_kWh;
+	public double p_avgEVStorageTruck_kWh;
+
+	public double p_avgEVEnergyConsumptionCar_kWhpkm;
+	public double p_avgEVEnergyConsumptionVan_kWhpkm;
+	public double p_avgEVEnergyConsumptionTruck_kWhpkm;	
+	public double p_avgDieselConsumptionCar_kmpl;
+	public double p_avgGasolineConsumptionCar_kmpl;	
+	public double p_avgDieselConsumptionCar_kWhpkm;
+	public double p_avgGasolineConsumptionCar_kWhpkm;
+	public double p_avgDieselConsumptionVan_kmpl;
+	public double p_avgDieselConsumptionVan_kWhpkm;
+	public double p_avgDieselConsumptionTruck_kmpl;
+	public double p_avgDieselConsumptionTruck_kWhpkm;
+	public double p_avgHydrogenConsumptionCar_kWhpkm;
+	public double p_avgHydrogenConsumptionVan_kWhpkm;
+	public double p_avgHydrogenConsumptionTruck_kWhpkm;
+	
+	public double p_avgVehiclesPerCharger_Chargepoint;
+	public double p_avgVehiclesPerCharger_Centre;
+	public double p_v1gProbability;
+	public double p_v2gProbability;
+	
 	public double p_avgAnnualTravelDistancePrivateCar_km;
 	public double p_avgAnnualTravelDistanceCompanyCar_km;
 	public double p_avgAnnualTravelDistanceVan_km;
 	public double p_avgAnnualTravelDistanceTruck_km;
+	public double p_minAnnualTravelDistanceSurveyVehicle_km;
+	
+
+	
+	////Constants
+	public double p_gas_kWhpm3;
+	public double p_diesel_kWhpl;
+	public double p_gasoline_kWhpl;
+	public double p_waterHeatCapacity_JpkgK;
+	public double p_waterDensity_kgpm3;
+	
+	public double p_hydrogenEnergyDensity_kWh_Nm3;
+	public double p_hydrogenSpecificEnergy_kWh_kg;
+	public double p_hydrogenDensity_kg_Nm3;
+	public double p_oxygenDensity_kg_Nm3;
+	public double p_oxygenProduction_kgO2pkgH2;
+	
+
+	
+	
 	/**
      * Default constructor
      */
@@ -100,11 +143,4 @@ public J_AVGC_data() {
 	public String toString() {
 		return super.toString();
 	}
-
-	/**
-	 * This number is here for model snapshot storing purpose<br>
-	 * It needs to be changed when this class gets changed
-	 */ 
-	private static final long serialVersionUID = 1L;
-
 }
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_HeatingPreferences.java b/_alp/Classes/Class.J_HeatingPreferences.java
index 1e4c063d..74b01051 100644
--- a/_alp/Classes/Class.J_HeatingPreferences.java
+++ b/_alp/Classes/Class.J_HeatingPreferences.java
@@ -67,8 +67,15 @@ public double getMinComfortTemperature_degC() {
     	return this.minComfortTemperature_degC;
     }
     
-    
-    
+	public double getCurrentPreferedTemperatureSetpoint_degC(double timeOfDay_h) {
+		if (timeOfDay_h < getStartOfDayTime_h() || timeOfDay_h >= getStartOfNightTime_h()) {
+			return getNightTimeSetPoint_degC();
+		}
+		else {
+			return getDayTimeSetPoint_degC();
+		}
+	}
+	
 	@Override
 	public String toString() {
 		return 
diff --git a/_alp/Classes/Class.J_PBLParameters.java b/_alp/Classes/Class.J_PBLParameters.java
new file mode 100644
index 00000000..11d23e6a
--- /dev/null
+++ b/_alp/Classes/Class.J_PBLParameters.java
@@ -0,0 +1,52 @@
+/**
+ * J_PBLParameters
+ */	
+public class J_PBLParameters {
+	private final OL_PBL_BuildingType buildingType;
+	private final OL_PBL_OwnershipType ownershipType;
+	private final OL_GridConnectionInsulationLabel defaultInsulationLabel;
+	private final double localFactor;
+	private final double regionalClimateCorrectionFactor;
+    
+	
+	/**
+     * Default constructor
+     */
+    public J_PBLParameters(OL_PBL_BuildingType buildingType, OL_PBL_OwnershipType ownershipType, OL_GridConnectionInsulationLabel defaultInsulationLabel, Double localFactor, Double regionalClimateCorrectionFactor) {
+    	this.buildingType = buildingType;
+    	this.ownershipType = ownershipType;
+    	this.defaultInsulationLabel = defaultInsulationLabel;
+    	this.localFactor = localFactor;
+    	this.regionalClimateCorrectionFactor = regionalClimateCorrectionFactor;
+    }
+    
+    public OL_PBL_BuildingType getBuildingType() {
+        return buildingType;
+    }
+
+    public OL_PBL_OwnershipType getOwnershipType() {
+        return ownershipType;
+    }
+
+    public OL_GridConnectionInsulationLabel getDefaultInsulationLabel() {
+        return defaultInsulationLabel;
+    }
+
+    public double getLocalFactor() {
+        return localFactor;
+    }
+
+    public double getRegionalClimateCorrectionFactor() {
+        return regionalClimateCorrectionFactor;
+    }
+    
+    @Override
+    public String toString() {
+        return "PBL parameters: \n" +
+                "buildingType = " + buildingType +
+                ",\n ownershipType = " + ownershipType +
+                ",\n defaultIsolationLabel = " + defaultInsulationLabel +
+                ",\n localFactor = " + localFactor +
+                ",\n regionalClimateCorrectionFactor = " + regionalClimateCorrectionFactor;
+    }
+}
\ No newline at end of file