Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/input.py
===================================================================
diff -u -r3508 -r3518
--- DamClients/DamPythonInterface/trunk/src/dampythoninterface/input.py	(.../input.py)	(revision 3508)
+++ DamClients/DamPythonInterface/trunk/src/dampythoninterface/input.py	(.../input.py)	(revision 3518)
@@ -54,6 +54,20 @@
     Class that contains all inputs for the DAM engine xml.
 
     :param SurfaceLines: List of surface lines for different profiles.
+    :param Soils: List of available soil
+    :param StabilityParameters: Stability parameters
+    :param Locations: List of locations
+    :param FailureMechanismSystemType: FailureMechanismSystem
+    :param Segments: List of segments
+    :param SoilProfiles1D: List of soil 1D profiles
+    :param StabilityModelType: StabilityType
+    :param ProjectPath: Path to the project folder
+    :param MaxCalculationCores: Maximum number of cores selected for the calculation
+    :param __xmlns_xsi__: Default parameter that has to do with the xml format
+    :param __xmlns_xsd__: Default parameter that has to do with the xml format
+    :param __DamProjectType__: Project type
+    :param __AnalysisType__: Analysis type
+    :param CalculationMap: Path to calculation map
 
     """
 
@@ -63,12 +77,11 @@
     SoilProfiles1D: List[SoilProfile1D] = []
     Segments: List[Segment] = []
     Locations: List[Location] = []
-    FailureMechanismSystemType: Optional[
-        FailureMechanismSystem
-    ] = FailureMechanismSystem.StabilityInside
+    FailureMechanismSystemType: FailureMechanismSystem
     StabilityModelType: StabilityType
     __AnalysisType__ = "NoAdaption"
     ProjectPath: Path
+    CalculationMap: Optional[Path] = None
     MaxCalculationCores: Optional[int] = 1
     __xmlns_xsi__: str = "http://www.w3.org/2001/XMLSchema-instance"
     __xmlns_xsd__: str = "http://www.w3.org/2001/XMLSchema"
@@ -119,6 +132,8 @@
         input_root.set("AnalysisType", self.__AnalysisType__)
         input_root.set("ProjectPath", str(self.ProjectPath.resolve()))
         input_root.set("MaxCalculationCores", str(self.MaxCalculationCores))
+        if self.CalculationMap is not None:
+            input_root.set("CalculationMap", str(self.CalculationMap.resolve()))
         # create location line element
         locations_root = et.Element("Locations")
         for location in self.Locations:
Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/location.py
===================================================================
diff -u -r3509 -r3518
--- DamClients/DamPythonInterface/trunk/src/dampythoninterface/location.py	(.../location.py)	(revision 3509)
+++ DamClients/DamPythonInterface/trunk/src/dampythoninterface/location.py	(.../location.py)	(revision 3518)
@@ -238,17 +238,17 @@
     """
     Dataclass of Location
 
-    SurfaceLineName: surface line that is assigned to location
-    SegmentName: segment that is assigned to location
-    Name: name of the location
-    DikeEmbankmentMaterial: dike embankment material that is assigned to location
-    XSoilGeometry2DOrigin: origin of soil of 2D geometry
-    DistanceToEntryPoint: distance to entry point
-    DesignOptions: design options
-    General: general options
-    DesignScenarios: list of design scenarios
-    StabilityOptions: stability options
-    WaternetOptions: waternet options
+    :param SurfaceLineName: surface line that is assigned to location
+    :param SegmentName: segment that is assigned to location
+    :param Name: name of the location
+    :param DikeEmbankmentMaterial: dike embankment material that is assigned to location
+    :param XSoilGeometry2DOrigin: origin of soil of 2D geometry
+    :param DistanceToEntryPoint: distance to entry point
+    :param DesignOptions: design options
+    :param General: general options
+    :param DesignScenarios: list of design scenarios
+    :param StabilityOptions: stability options
+    :param WaternetOptions: waternet options
 
 
     """
Index: DamClients/DamPythonInterface/trunk/src/tests/test_input.py
===================================================================
diff -u -r3508 -r3518
--- DamClients/DamPythonInterface/trunk/src/tests/test_input.py	(.../test_input.py)	(revision 3508)
+++ DamClients/DamPythonInterface/trunk/src/tests/test_input.py	(.../test_input.py)	(revision 3518)
@@ -22,7 +22,6 @@
 from typing import List
 import pytest
 from pathlib import Path
-from lxml import etree
 
 from dampythoninterface.input import DamInput, FailureMechanismSystem, StabilityType
 from dampythoninterface.surface_line import SurfaceLine, PointTypeEnum, Point
@@ -145,26 +144,8 @@
     def create_surface_lines(self) -> List[SurfaceLine]:
         # Create surface lines
         X = [0, 10, 19, 20.5, 23, 23, 35, 100]
-        Z = [
-            1,
-            1,
-            4,
-            4,
-            4,
-            4,
-            0,
-            0,
-        ]
-        PointTypeList = [
-            1,
-            5,
-            8,
-            10,
-            11,
-            12,
-            15,
-            25,
-        ]
+        Z = [1, 1, 4, 4, 4, 4, 0, 0]
+        PointTypeList = [1, 5, 8, 10, 11, 12, 15, 25]
 
         list_of_points = [
             Point(
Index: DamClients/DamPythonInterface/trunk/src/tests/test_surface_line.py
===================================================================
diff -u -r3508 -r3518
--- DamClients/DamPythonInterface/trunk/src/tests/test_surface_line.py	(.../test_surface_line.py)	(revision 3508)
+++ DamClients/DamPythonInterface/trunk/src/tests/test_surface_line.py	(.../test_surface_line.py)	(revision 3518)
@@ -140,26 +140,8 @@
         # Initialize class to be tested
         # Create surface lines
         X = [0, 10, 19, 20.5, 23, 23, 35, 100]
-        Z = [
-            1,
-            1,
-            4,
-            4,
-            4,
-            4,
-            0,
-            0,
-        ]
-        PointTypeList = [
-            1,
-            5,
-            8,
-            10,
-            11,
-            12,
-            15,
-            25,
-        ]
+        Z = [1, 1, 4, 4, 4, 4, 0, 0]
+        PointTypeList = [1, 5, 8, 10, 11, 12, 15, 25]
 
         list_of_points = [
             Point(