Index: DamClients/DamPythonInterface/trunk/src/tests/test_location.py
===================================================================
diff -u -r3503 -r3509
--- DamClients/DamPythonInterface/trunk/src/tests/test_location.py	(.../test_location.py)	(revision 3503)
+++ DamClients/DamPythonInterface/trunk/src/tests/test_location.py	(.../test_location.py)	(revision 3509)
@@ -19,7 +19,15 @@
 # Stichting Deltares and remain full property of Stichting Deltares at all times.
 # All rights reserved.
 
-from dampythoninterface.location import DesignScenario, Location
+from dampythoninterface.location import (
+    DesignScenario,
+    Location,
+    General,
+    WaternetOptions,
+    PhreaticLineCreationMethodType,
+    IntrusionVerticalWaterPressureType,
+    DikeSoilScenarioType,
+)
 
 import pytest
 from .utils import TestUtils
@@ -59,6 +67,21 @@
             RequiredSafetyFactorPiping=1.1,
             PolderLevel=6,
         )
+        general_settings = General(
+            Description="General settings for the project",
+            HeadPL2=0,
+            HeadPL3=1,
+            HeadPL4=3,
+        )
+        waternet_options = WaternetOptions(
+            PhreaticLineCreationMethod=PhreaticLineCreationMethodType.ExpertKnowledgeRRD,
+            DampingFactorPl3=0,
+            DampingFactorPl4=0,
+            PenetrationLength=0,
+            SlopeDampingFactor=0,
+            IntrusionVerticalWaterPressure=IntrusionVerticalWaterPressureType.Standard,
+            DikeSoilScenario=DikeSoilScenarioType.ClayDikeOnClay,
+        )
         # define location
         model_location = Location(
             SurfaceLineName="Line 1",
@@ -67,6 +90,8 @@
             DikeEmbankmentMaterial="clay",
             XSoilGeometry2DOrigin=4,
             DesignScenarios=[design_scenario_1, design_scenario_2],
+            General=general_settings,
+            WaternetOptions=waternet_options,
         )
         # check initial expectations
         assert model_location.Name == "Location of dike"
Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/location.py
===================================================================
diff -u -r3508 -r3509
--- DamClients/DamPythonInterface/trunk/src/dampythoninterface/location.py	(.../location.py)	(revision 3508)
+++ DamClients/DamPythonInterface/trunk/src/dampythoninterface/location.py	(.../location.py)	(revision 3509)
@@ -148,9 +148,9 @@
     """
 
     Description: str
-    HeadPL2: float = 0
-    HeadPL3: float = 0
-    HeadPL4: float = 0
+    HeadPL2: Optional[float]
+    HeadPL3: Optional[float]
+    HeadPL4: Optional[float]
 
 
 class DesignScenario(BaseDataClass):
@@ -224,8 +224,8 @@
 
     """
 
-    MapForSoilgeometries2D: str
-    SoilDatabaseName: str
+    MapForSoilgeometries2D: Optional[str] = ""
+    SoilDatabaseName: Optional[str] = ""
     ZoneType: ZoneTypeClass
     ForbiddenZoneFactor: Optional[float] = 0
     ZoneAreaRestSlopeCrestWidth: Optional[float] = 0
@@ -244,7 +244,6 @@
     DikeEmbankmentMaterial: dike embankment material that is assigned to location
     XSoilGeometry2DOrigin: origin of soil of 2D geometry
     DistanceToEntryPoint: distance to entry point
-    OperationalOptions: operational options
     DesignOptions: design options
     General: general options
     DesignScenarios: list of design scenarios
@@ -260,7 +259,6 @@
     DikeEmbankmentMaterial: str
     XSoilGeometry2DOrigin: Optional[float] = 0
     DistanceToEntryPoint: Optional[float] = 0
-    OperationalOptions: Optional[float]
     DesignOptions: Optional[DesignOptions]
     General: Optional[General]
     DesignScenarios: List[DesignScenario]
Index: DamClients/DamPythonInterface/trunk/src/tests/test_data/test_serialize_location.xml
===================================================================
diff -u -r3501 -r3509
--- DamClients/DamPythonInterface/trunk/src/tests/test_data/test_serialize_location.xml	(.../test_serialize_location.xml)	(revision 3501)
+++ DamClients/DamPythonInterface/trunk/src/tests/test_data/test_serialize_location.xml	(.../test_serialize_location.xml)	(revision 3509)
@@ -3,4 +3,6 @@
     <DesignScenario Id="1" RiverLevel="3.2" RiverLevelLow="1" DikeTableHeight="1" PlLineOffsetBelowDikeTopAtRiver="1.1" PlLineOffsetBelowDikeTopAtPolder="2.1" PlLineOffsetBelowShoulderBaseInside="3.1" PlLineOffsetBelowDikeToeAtPolder="4.1" PlLineOffsetBelowDikeCrestMiddle="1" PlLineOffsetFactorBelowShoulderCrest="1" HeadPl3="1" HeadPl4="1" UpliftCriterionStability="5.0" UpliftCriterionPiping="0.0" RequiredSafetyFactorStabilityInnerSlope="1.6" RequiredSafetyFactorStabilityOuterSlope="1.5" RequiredSafetyFactorPiping="2.1" PolderLevel="4.0" HeadPl2="1"/>
     <DesignScenario Id="2" RiverLevel="2.2" RiverLevelLow="1" DikeTableHeight="1" PlLineOffsetBelowDikeTopAtRiver="2.1" PlLineOffsetBelowDikeTopAtPolder="1.1" PlLineOffsetBelowShoulderBaseInside="5.1" PlLineOffsetBelowDikeToeAtPolder="6.1" PlLineOffsetBelowDikeCrestMiddle="1" PlLineOffsetFactorBelowShoulderCrest="1" HeadPl3="1" HeadPl4="1" UpliftCriterionStability="1.0" UpliftCriterionPiping="2.0" RequiredSafetyFactorStabilityInnerSlope="2.6" RequiredSafetyFactorStabilityOuterSlope="2.5" RequiredSafetyFactorPiping="1.1" PolderLevel="6.0" HeadPl2="1"/>
   </DesignScenarios>
+  <General Description="General settings for the project" HeadPL2="0.0" HeadPL3="1.0" HeadPL4="3.0"/>
+  <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" DampingFactorPl3="0.0" DampingFactorPl4="0.0" PenetrationLength="0.0" SlopeDampingFactor="0.0" IntrusionVerticalWaterPressure="Standard" DikeSoilScenario="ClayDikeOnClay"/>
 </Location>