diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index 827943f..c7d47ff 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -398,31 +398,22 @@
 			</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>
@@ -455,39 +446,67 @@
 			</OptionList>
 			<OptionList>
 				<Id>1660226249511</Id>
-				<Name><![CDATA[OL_ActorType]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
+				<Name><![CDATA[OL_PBL_ConstructionPeriod]]></Name>
+				<Description><![CDATA[Bouwperiode (B)
+0: Tot en met 1929
+1: 1930 t/m 1945
+2: 1946 t/m 1964
+3: 1965 t/m 1974
+4; 1975 t/m 1991
+5: 1992 t/m 1995
+6: 1996 t/m 1999
+7: 2000 t/m 2005
+8: 2006 t/m 2010
+9: 2011 t/m 2014
+10: 2015 t/m 2020
+11: 2021 en later]]></Description>
 				<Option>
-					<Id>1660226249512</Id>
-					<Name><![CDATA[CONNECTIONOWNER]]></Name>
+					<Id>1768317455510</Id>
+					<Name><![CDATA[TYPE_0]]></Name>
 				</Option>
 				<Option>
-					<Id>1660226249513</Id>
-					<Name><![CDATA[GOV]]></Name>
+					<Id>1768317424302</Id>
+					<Name><![CDATA[TYPE_1]]></Name>
 				</Option>
 				<Option>
-					<Id>1660226249514</Id>
-					<Name><![CDATA[SUPPLIERENERGY]]></Name>
+					<Id>1768317424303</Id>
+					<Name><![CDATA[TYPE_2]]></Name>
 				</Option>
 				<Option>
-					<Id>1660226249515</Id>
-					<Name><![CDATA[COOPENERGY]]></Name>
+					<Id>1768317424304</Id>
+					<Name><![CDATA[TYPE_3]]></Name>
 				</Option>
 				<Option>
-					<Id>1660577544099</Id>
-					<Name><![CDATA[OPERATORGRID]]></Name>
+					<Id>1768317424305</Id>
+					<Name><![CDATA[TYPE_4]]></Name>
 				</Option>
 				<Option>
-					<Id>1692796172966</Id>
-					<Name><![CDATA[GOVHOLON]]></Name>
+					<Id>1768317424306</Id>
+					<Name><![CDATA[TYPE_5]]></Name>
 				</Option>
 				<Option>
-					<Id>1703256179429</Id>
-					<Name><![CDATA[SUBTENANT]]></Name>
+					<Id>1768317424307</Id>
+					<Name><![CDATA[TYPE_6]]></Name>
+				</Option>
+				<Option>
+					<Id>1768317426354</Id>
+					<Name><![CDATA[TYPE_7]]></Name>
+				</Option>
+				<Option>
+					<Id>1768317426355</Id>
+					<Name><![CDATA[TYPE_8]]></Name>
+				</Option>
+				<Option>
+					<Id>1768317426356</Id>
+					<Name><![CDATA[TYPE_9]]></Name>
+				</Option>
+				<Option>
+					<Id>1768317426357</Id>
+					<Name><![CDATA[TYPE_10]]></Name>
 				</Option>
 				<Option>
-					<Id>1717960308322</Id>
-					<Name><![CDATA[CPO]]></Name>
+					<Id>1768317426358</Id>
+					<Name><![CDATA[TYPE_11]]></Name>
 				</Option>
 			</OptionList>
 			<OptionList>
@@ -1100,6 +1119,41 @@
 					<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>
 		</OptionLists>
 		<Folders>
 			<Folder>
@@ -1829,6 +1883,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 e3879f0..62683fe 100644
--- a/_alp/Agents/EnergyModel/EmbeddedObjects.xml
+++ b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
@@ -1006,22 +1006,7 @@
 				<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>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_regionalClimateCorrectionFactor_heatingPBL]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_schillabel_heatingPBL]]></Name>
+				<Name><![CDATA[p_PBLParameters]]></Name>
 			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
diff --git a/_alp/Agents/GCHouse/AOC.GCHouse.xml b/_alp/Agents/GCHouse/AOC.GCHouse.xml
index ed81c7d..4050e40 100644
--- a/_alp/Agents/GCHouse/AOC.GCHouse.xml
+++ b/_alp/Agents/GCHouse/AOC.GCHouse.xml
@@ -84,6 +84,9 @@
 		<Parameter>
 			<Name><![CDATA[v_isActive]]></Name>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[p_PBLParameters]]></Name>
+		</Parameter>
 	</Parameters>
 	<Generic>false</Generic>
 	<GenericParameter>
diff --git a/_alp/Agents/GCHouse/Variables.xml b/_alp/Agents/GCHouse/Variables.xml
index 83d57c3..6cd8516 100644
--- a/_alp/Agents/GCHouse/Variables.xml
+++ b/_alp/Agents/GCHouse/Variables.xml
@@ -229,7 +229,7 @@
 		<Id>1717323052486</Id>
 		<Name><![CDATA[p_bouwjaar]]></Name>
 		<X>50</X>
-		<Y>510</Y>
+		<Y>520</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>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>560</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/Classes/Class.J_AVGC_data.java b/_alp/Classes/Class.J_AVGC_data.java
index 731b3f2..a6c5aa6 100644
--- a/_alp/Classes/Class.J_AVGC_data.java
+++ b/_alp/Classes/Class.J_AVGC_data.java
@@ -82,14 +82,17 @@ public class J_AVGC_data implements Serializable {
 	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_avgAnnualTravelDistancePrivateCar_km;
 	public double p_avgAnnualTravelDistanceCompanyCar_km;
 	public double p_avgAnnualTravelDistanceVan_km;
 	public double p_avgAnnualTravelDistanceTruck_km;
+	public double p_minAnnualTravelDistanceSurveyVehicle_km;
 	/**
      * Default constructor
      */
@@ -100,11 +103,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_PBLParameters.java b/_alp/Classes/Class.J_PBLParameters.java
new file mode 100644
index 0000000..b418cec
--- /dev/null
+++ b/_alp/Classes/Class.J_PBLParameters.java
@@ -0,0 +1,59 @@
+/**
+ * J_PBLParameters
+ */	
+public class J_PBLParameters {
+	private final OL_PBL_BuildingType buildingType;
+	private final OL_PBL_OwnershipType ownershipType;
+	private final OL_PBL_ConstructionPeriod constructionPeriod;
+	private final OL_GridConnectionIsolationLabel defaultIsolationLabel;
+	private final double localFactor;
+	private final double regionalClimateCorrectionFactor;
+    
+	
+	/**
+     * Default constructor
+     */
+    public J_PBLParameters(OL_PBL_BuildingType buildingType, OL_PBL_OwnershipType ownershipType, OL_PBL_ConstructionPeriod constructionPeriod, OL_GridConnectionIsolationLabel defaultIsolationLabel, Double localFactor, Double regionalClimateCorrectionFactor) {
+    	this.buildingType = buildingType;
+    	this.ownershipType = ownershipType;
+    	this.constructionPeriod = constructionPeriod;
+    	this.defaultIsolationLabel = defaultIsolationLabel;
+    	this.localFactor = localFactor;
+    	this.regionalClimateCorrectionFactor = regionalClimateCorrectionFactor;
+    }
+    
+    public OL_PBL_BuildingType getBuildingType() {
+        return buildingType;
+    }
+
+    public OL_PBL_OwnershipType getOwnershipType() {
+        return ownershipType;
+    }
+
+    public OL_PBL_ConstructionPeriod getConstructionPeriod() {
+        return constructionPeriod;
+    }
+
+    public OL_GridConnectionIsolationLabel getDefaultIsolationLabel() {
+        return defaultIsolationLabel;
+    }
+
+    public double getLocalFactor() {
+        return localFactor;
+    }
+
+    public double getRegionalClimateCorrectionFactor() {
+        return regionalClimateCorrectionFactor;
+    }
+    
+    @Override
+    public String toString() {
+        return "PBL parameters: \n" +
+                "buildingType = " + buildingType +
+                ", \n ownershipType = " + ownershipType +
+                ", \n constructionPeriod = " + constructionPeriod +
+                ", \n defaultIsolationLabel = " + defaultIsolationLabel +
+                ", \n localFactor = " + localFactor +
+                ", \n regionalClimateCorrectionFactor = " + regionalClimateCorrectionFactor;
+    }
+}
\ No newline at end of file