Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillIoDamMStabDocFromXml.cs
===================================================================
diff -u -r3117 -r3120
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillIoDamMStabDocFromXml.cs	(.../FillIoDamMStabDocFromXml.cs)	(revision 3117)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillIoDamMStabDocFromXml.cs	(.../FillIoDamMStabDocFromXml.cs)	(revision 3120)
@@ -19,6 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Net.Http.Headers;
+
 namespace Deltares.LayerOnSlopeTool.Io
 {
     public static class FillIoDamMStabDocFromXml
@@ -29,8 +31,13 @@
         public static IoMStabDamDoc FillIoDamMStabDoc(tnsPrefixDamMStabDoc xmlDamMStabDamDoc)
         {
             var ioMStabDamDoc = new IoMStabDamDoc();
+            TransferGeometryCreationOptions(ioMStabDamDoc.MStabInput.GeometryCreationOptions);
             return ioMStabDamDoc;
         }
 
+        private static void TransferGeometryCreationOptions(IoGeometryCreationOptions geometryCreationOptions)
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
\ No newline at end of file
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/DamMStabDoc.cs
===================================================================
diff -u -r3114 -r3120
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/DamMStabDoc.cs	(.../DamMStabDoc.cs)	(revision 3114)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/DamMStabDoc.cs	(.../DamMStabDoc.cs)	(revision 3120)
@@ -46,13 +46,13 @@
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public partial class tnsbPrefixSurfaceLineTnsbPrefixSurfacePoint {
         
-        private string xCoordField;
+        private double xCoordField;
         
-        private string yCoordField;
+        private double yCoordField;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string XCoord {
+        public double XCoord {
             get {
                 return this.xCoordField;
             }
@@ -63,7 +63,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string YCoord {
+        public double YCoord {
             get {
                 return this.yCoordField;
             }
@@ -104,15 +104,15 @@
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public partial class tnsbPrefixCharacteristicPointsTnsbPrefixCharacteristicPoint {
         
-        private string xCoordField;
+        private double xCoordField;
         
-        private string yCoordField;
+        private double yCoordField;
         
-        private string characteristicPointTypeField;
+        private CharacteristicPointType characteristicPointTypeField;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string XCoord {
+        public double XCoord {
             get {
                 return this.xCoordField;
             }
@@ -123,7 +123,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string YCoord {
+        public double YCoord {
             get {
                 return this.yCoordField;
             }
@@ -134,7 +134,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string CharacteristicPointType {
+        public CharacteristicPointType CharacteristicPointType {
             get {
                 return this.characteristicPointTypeField;
             }
@@ -147,6 +147,66 @@
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
+    public enum CharacteristicPointType {
+        
+        /// <remarks/>
+        None,
+        
+        /// <remarks/>
+        SurfaceLevelOutside,
+        
+        /// <remarks/>
+        DikeToeAtRiver,
+        
+        /// <remarks/>
+        ShoulderTopOutside,
+        
+        /// <remarks/>
+        ShoulderBaseOutside,
+        
+        /// <remarks/>
+        DikeTopAtRiver,
+        
+        /// <remarks/>
+        DikeLine,
+        
+        /// <remarks/>
+        TrafficLoadOutside,
+        
+        /// <remarks/>
+        TrafficLoadInside,
+        
+        /// <remarks/>
+        DikeTopAtPolder,
+        
+        /// <remarks/>
+        ShoulderBaseInside,
+        
+        /// <remarks/>
+        ShoulderTopInside,
+        
+        /// <remarks/>
+        DikeToeAtPolder,
+        
+        /// <remarks/>
+        DitchDikeSide,
+        
+        /// <remarks/>
+        BottomDitchDikeSide,
+        
+        /// <remarks/>
+        BottomDitchPolderSide,
+        
+        /// <remarks/>
+        DitchPolderSide,
+        
+        /// <remarks/>
+        SurfaceLevelInside,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
@@ -177,8 +237,10 @@
         
         private tnsbPrefixExternalPLLinesTnsbPrefixPLLineTnsbPrefixPLPoint[] tnsbPrefixPLPointField;
         
-        private string isPhreaticField;
+        private bool isPhreaticField;
         
+        private bool isPhreaticFieldSpecified;
+        
         private string boundaryLayerField;
         
         /// <remarks/>
@@ -194,7 +256,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string IsPhreatic {
+        public bool IsPhreatic {
             get {
                 return this.isPhreaticField;
             }
@@ -204,7 +266,18 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool IsPhreaticSpecified {
+            get {
+                return this.isPhreaticFieldSpecified;
+            }
+            set {
+                this.isPhreaticFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute(DataType="integer")]
         public string BoundaryLayer {
             get {
                 return this.boundaryLayerField;
@@ -223,13 +296,17 @@
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public partial class tnsbPrefixExternalPLLinesTnsbPrefixPLLineTnsbPrefixPLPoint {
         
-        private string xCoordField;
+        private double xCoordField;
         
-        private string yCoordField;
+        private bool xCoordFieldSpecified;
         
+        private double yCoordField;
+        
+        private bool yCoordFieldSpecified;
+        
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string XCoord {
+        public double XCoord {
             get {
                 return this.xCoordField;
             }
@@ -239,15 +316,37 @@
         }
         
         /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool XCoordSpecified {
+            get {
+                return this.xCoordFieldSpecified;
+            }
+            set {
+                this.xCoordFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string YCoord {
+        public double YCoord {
             get {
                 return this.yCoordField;
             }
             set {
                 this.yCoordField = value;
             }
         }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool YCoordSpecified {
+            get {
+                return this.yCoordFieldSpecified;
+            }
+            set {
+                this.yCoordFieldSpecified = value;
+            }
+        }
     }
     
     /// <remarks/>
@@ -259,19 +358,19 @@
     [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)]
     public partial class tnsbPrefixModel {
         
-        private string calculationModelField;
+        private ModelType calculationModelField;
         
-        private string shearStrengthField;
+        private ShearStrengthType shearStrengthField;
         
-        private string probabilisticField;
+        private bool probabilisticField;
         
-        private string searchMethodField;
+        private SearchMethodType searchMethodField;
         
-        private string gridPositionField;
+        private GridPositionType gridPositionField;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string CalculationModel {
+        public ModelType CalculationModel {
             get {
                 return this.calculationModelField;
             }
@@ -282,7 +381,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string ShearStrength {
+        public ShearStrengthType ShearStrength {
             get {
                 return this.shearStrengthField;
             }
@@ -293,7 +392,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string Probabilistic {
+        public bool Probabilistic {
             get {
                 return this.probabilisticField;
             }
@@ -304,7 +403,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string SearchMethod {
+        public SearchMethodType SearchMethod {
             get {
                 return this.searchMethodField;
             }
@@ -315,7 +414,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string GridPosition {
+        public GridPositionType GridPosition {
             get {
                 return this.gridPositionField;
             }
@@ -328,10 +427,61 @@
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
+    public enum ModelType {
+        
+        /// <remarks/>
+        Bishop,
+        
+        /// <remarks/>
+        UpliftVan,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.SerializableAttribute()]
+    public enum ShearStrengthType {
+        
+        /// <remarks/>
+        CPhi,
+        
+        /// <remarks/>
+        CuCalculated,
+        
+        /// <remarks/>
+        CuMeasured,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.SerializableAttribute()]
+    public enum SearchMethodType {
+        
+        /// <remarks/>
+        Grid,
+        
+        /// <remarks/>
+        GeneticAlgorithm,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.SerializableAttribute()]
+    public enum GridPositionType {
+        
+        /// <remarks/>
+        Left,
+        
+        /// <remarks/>
+        Right,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)]
+    [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
     public partial class tnsbPrefixTrafficLoad {
         
         private string xCoordinateAtRiverField;
@@ -406,7 +556,7 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)]
+    [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
     public partial class tnsbPrefixCalculationOptions {
         
         private string minimalCircleDepthField;
@@ -445,11 +595,11 @@
     [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)]
     public partial class tnsbPrefixGeometryCreationOptions {
         
-        private string soilGeometryTypeField;
+        private SoilGeometryType soilGeometryTypeField;
         
         private string soilGeometry2DFilenameField;
         
-        private string xOffsetSoilGeometry2DOriginField;
+        private double xOffsetSoilGeometry2DOriginField;
         
         private string materialForDikeField;
         
@@ -467,7 +617,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string SoilGeometryType {
+        public SoilGeometryType SoilGeometryType {
             get {
                 return this.soilGeometryTypeField;
             }
@@ -489,7 +639,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string XOffsetSoilGeometry2DOrigin {
+        public double XOffsetSoilGeometry2DOrigin {
             get {
                 return this.xOffsetSoilGeometry2DOriginField;
             }
@@ -579,10 +729,22 @@
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
+    public enum SoilGeometryType {
+        
+        /// <remarks/>
+        SoilGeometry1D,
+        
+        /// <remarks/>
+        SoilGeometry2D,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)]
+    [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
     public partial class tnsbPrefixHorizontalBalanceArea {
         
         private string xLeftField;
@@ -660,45 +822,65 @@
     [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)]
     public partial class tnsbPrefixSlipCircleDefinition {
         
-        private string xCoordinateLastUpliftPointField;
+        private double xCoordinateLastUpliftPointField;
         
-        private string upliftVanTangentLinesDefinitionField;
+        private TangentLinesDefinitionType upliftVanTangentLinesDefinitionField;
         
-        private string upliftVanTangentLinesDistanceField;
+        private bool upliftVanTangentLinesDefinitionFieldSpecified;
         
-        private string bishopTangentLinesDefinitionField;
+        private double upliftVanTangentLinesDistanceField;
         
-        private string bishopTangentLinesDistanceField;
+        private bool upliftVanTangentLinesDistanceFieldSpecified;
         
-        private string gridSizeDeterminationField;
+        private TangentLinesDefinitionType bishopTangentLinesDefinitionField;
         
+        private bool bishopTangentLinesDefinitionFieldSpecified;
+        
+        private double bishopTangentLinesDistanceField;
+        
+        private bool bishopTangentLinesDistanceFieldSpecified;
+        
+        private GridSizeDeterminationType gridSizeDeterminationField;
+        
         private string upliftVanLeftGridVerticalPointCountField;
         
-        private string upliftVanLeftGridVerticalPointDistanceField;
+        private double upliftVanLeftGridVerticalPointDistanceField;
         
+        private bool upliftVanLeftGridVerticalPointDistanceFieldSpecified;
+        
         private string upliftVanLeftGridHorizontalPointCountField;
         
-        private string upliftVanLeftGridHorizontalPointDistanceField;
+        private double upliftVanLeftGridHorizontalPointDistanceField;
         
+        private bool upliftVanLeftGridHorizontalPointDistanceFieldSpecified;
+        
         private string upliftVanRightGridVerticalPointCountField;
         
-        private string upliftVanRightGridVerticalPointDistanceField;
+        private double upliftVanRightGridVerticalPointDistanceField;
         
+        private bool upliftVanRightGridVerticalPointDistanceFieldSpecified;
+        
         private string upliftVanRightGridHorizontalPointCountField;
         
-        private string upliftVanRightGridHorizontalPointDistanceField;
+        private double upliftVanRightGridHorizontalPointDistanceField;
         
+        private bool upliftVanRightGridHorizontalPointDistanceFieldSpecified;
+        
         private string bishopGridVerticalPointCountField;
         
-        private string bishopGridVerticalPointDistanceField;
+        private double bishopGridVerticalPointDistanceField;
         
+        private bool bishopGridVerticalPointDistanceFieldSpecified;
+        
         private string bishopGridHorizontalPointCountField;
         
-        private string bishopGridHorizontalPointDistanceField;
+        private double bishopGridHorizontalPointDistanceField;
         
+        private bool bishopGridHorizontalPointDistanceFieldSpecified;
+        
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string XCoordinateLastUpliftPoint {
+        public double XCoordinateLastUpliftPoint {
             get {
                 return this.xCoordinateLastUpliftPointField;
             }
@@ -709,7 +891,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string UpliftVanTangentLinesDefinition {
+        public TangentLinesDefinitionType UpliftVanTangentLinesDefinition {
             get {
                 return this.upliftVanTangentLinesDefinitionField;
             }
@@ -719,8 +901,19 @@
         }
         
         /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool UpliftVanTangentLinesDefinitionSpecified {
+            get {
+                return this.upliftVanTangentLinesDefinitionFieldSpecified;
+            }
+            set {
+                this.upliftVanTangentLinesDefinitionFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string UpliftVanTangentLinesDistance {
+        public double UpliftVanTangentLinesDistance {
             get {
                 return this.upliftVanTangentLinesDistanceField;
             }
@@ -730,8 +923,19 @@
         }
         
         /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool UpliftVanTangentLinesDistanceSpecified {
+            get {
+                return this.upliftVanTangentLinesDistanceFieldSpecified;
+            }
+            set {
+                this.upliftVanTangentLinesDistanceFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string BishopTangentLinesDefinition {
+        public TangentLinesDefinitionType BishopTangentLinesDefinition {
             get {
                 return this.bishopTangentLinesDefinitionField;
             }
@@ -741,8 +945,19 @@
         }
         
         /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool BishopTangentLinesDefinitionSpecified {
+            get {
+                return this.bishopTangentLinesDefinitionFieldSpecified;
+            }
+            set {
+                this.bishopTangentLinesDefinitionFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string BishopTangentLinesDistance {
+        public double BishopTangentLinesDistance {
             get {
                 return this.bishopTangentLinesDistanceField;
             }
@@ -752,8 +967,19 @@
         }
         
         /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool BishopTangentLinesDistanceSpecified {
+            get {
+                return this.bishopTangentLinesDistanceFieldSpecified;
+            }
+            set {
+                this.bishopTangentLinesDistanceFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string GridSizeDetermination {
+        public GridSizeDeterminationType GridSizeDetermination {
             get {
                 return this.gridSizeDeterminationField;
             }
@@ -763,7 +989,7 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttributeAttribute(DataType="integer")]
         public string UpliftVanLeftGridVerticalPointCount {
             get {
                 return this.upliftVanLeftGridVerticalPointCountField;
@@ -775,7 +1001,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string UpliftVanLeftGridVerticalPointDistance {
+        public double UpliftVanLeftGridVerticalPointDistance {
             get {
                 return this.upliftVanLeftGridVerticalPointDistanceField;
             }
@@ -785,7 +1011,18 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool UpliftVanLeftGridVerticalPointDistanceSpecified {
+            get {
+                return this.upliftVanLeftGridVerticalPointDistanceFieldSpecified;
+            }
+            set {
+                this.upliftVanLeftGridVerticalPointDistanceFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute(DataType="integer")]
         public string UpliftVanLeftGridHorizontalPointCount {
             get {
                 return this.upliftVanLeftGridHorizontalPointCountField;
@@ -797,7 +1034,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string UpliftVanLeftGridHorizontalPointDistance {
+        public double UpliftVanLeftGridHorizontalPointDistance {
             get {
                 return this.upliftVanLeftGridHorizontalPointDistanceField;
             }
@@ -807,7 +1044,18 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool UpliftVanLeftGridHorizontalPointDistanceSpecified {
+            get {
+                return this.upliftVanLeftGridHorizontalPointDistanceFieldSpecified;
+            }
+            set {
+                this.upliftVanLeftGridHorizontalPointDistanceFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute(DataType="integer")]
         public string UpliftVanRightGridVerticalPointCount {
             get {
                 return this.upliftVanRightGridVerticalPointCountField;
@@ -819,7 +1067,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string UpliftVanRightGridVerticalPointDistance {
+        public double UpliftVanRightGridVerticalPointDistance {
             get {
                 return this.upliftVanRightGridVerticalPointDistanceField;
             }
@@ -829,7 +1077,18 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool UpliftVanRightGridVerticalPointDistanceSpecified {
+            get {
+                return this.upliftVanRightGridVerticalPointDistanceFieldSpecified;
+            }
+            set {
+                this.upliftVanRightGridVerticalPointDistanceFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute(DataType="integer")]
         public string UpliftVanRightGridHorizontalPointCount {
             get {
                 return this.upliftVanRightGridHorizontalPointCountField;
@@ -841,7 +1100,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string UpliftVanRightGridHorizontalPointDistance {
+        public double UpliftVanRightGridHorizontalPointDistance {
             get {
                 return this.upliftVanRightGridHorizontalPointDistanceField;
             }
@@ -851,7 +1110,18 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool UpliftVanRightGridHorizontalPointDistanceSpecified {
+            get {
+                return this.upliftVanRightGridHorizontalPointDistanceFieldSpecified;
+            }
+            set {
+                this.upliftVanRightGridHorizontalPointDistanceFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute(DataType="integer")]
         public string BishopGridVerticalPointCount {
             get {
                 return this.bishopGridVerticalPointCountField;
@@ -863,7 +1133,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string BishopGridVerticalPointDistance {
+        public double BishopGridVerticalPointDistance {
             get {
                 return this.bishopGridVerticalPointDistanceField;
             }
@@ -873,7 +1143,18 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool BishopGridVerticalPointDistanceSpecified {
+            get {
+                return this.bishopGridVerticalPointDistanceFieldSpecified;
+            }
+            set {
+                this.bishopGridVerticalPointDistanceFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute(DataType="integer")]
         public string BishopGridHorizontalPointCount {
             get {
                 return this.bishopGridHorizontalPointCountField;
@@ -885,19 +1166,54 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string BishopGridHorizontalPointDistance {
+        public double BishopGridHorizontalPointDistance {
             get {
                 return this.bishopGridHorizontalPointDistanceField;
             }
             set {
                 this.bishopGridHorizontalPointDistanceField = value;
             }
         }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool BishopGridHorizontalPointDistanceSpecified {
+            get {
+                return this.bishopGridHorizontalPointDistanceFieldSpecified;
+            }
+            set {
+                this.bishopGridHorizontalPointDistanceFieldSpecified = value;
+            }
+        }
     }
     
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
+    public enum TangentLinesDefinitionType {
+        
+        /// <remarks/>
+        OnBoundaryLines,
+        
+        /// <remarks/>
+        Specified,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.SerializableAttribute()]
+    public enum GridSizeDeterminationType {
+        
+        /// <remarks/>
+        Automatic,
+        
+        /// <remarks/>
+        Specified,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
@@ -1064,6 +1380,7 @@
         }
         
         /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
         public tnsbPrefixTrafficLoad tnsbPrefixTrafficLoad {
             get {
                 return this.tnsbPrefixTrafficLoadField;
@@ -1074,6 +1391,7 @@
         }
         
         /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
         public tnsbPrefixCalculationOptions tnsbPrefixCalculationOptions {
             get {
                 return this.tnsbPrefixCalculationOptionsField;
@@ -1094,6 +1412,7 @@
         }
         
         /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
         public tnsbPrefixHorizontalBalanceArea tnsbPrefixHorizontalBalanceArea {
             get {
                 return this.tnsbPrefixHorizontalBalanceAreaField;
Index: DamTools/LayerOnSlopeTool/trunk/xsd/DamMStabDefinitions.xsd
===================================================================
diff -u -r3114 -r3120
--- DamTools/LayerOnSlopeTool/trunk/xsd/DamMStabDefinitions.xsd	(.../DamMStabDefinitions.xsd)	(revision 3114)
+++ DamTools/LayerOnSlopeTool/trunk/xsd/DamMStabDefinitions.xsd	(.../DamMStabDefinitions.xsd)	(revision 3120)
@@ -4,10 +4,10 @@
   <xs:element name="tnsbPrefixSurfaceLine">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="tnsbPrefixSurfacePoint">
+        <xs:element minOccurs="2" maxOccurs="unbounded" name="tnsbPrefixSurfacePoint">
           <xs:complexType>
-            <xs:attribute name="XCoord" type="xs:string" use="optional" />
-            <xs:attribute name="YCoord" type="xs:string" use="optional" />
+            <xs:attribute name="XCoord" type="xs:double" use="required" />
+            <xs:attribute name="YCoord" type="xs:double" use="required" />
           </xs:complexType>
         </xs:element>
       </xs:sequence>
@@ -18,9 +18,9 @@
       <xs:sequence>
         <xs:element minOccurs="0" maxOccurs="unbounded" name="tnsbPrefixCharacteristicPoint">
           <xs:complexType>
-            <xs:attribute name="XCoord" type="xs:string" use="optional" />
-            <xs:attribute name="YCoord" type="xs:string" use="optional" />
-            <xs:attribute name="CharacteristicPointType" type="xs:string" use="optional" />
+            <xs:attribute name="XCoord" type="xs:double" use="required" />
+            <xs:attribute name="YCoord" type="xs:double" use="required" />
+            <xs:attribute name="CharacteristicPointType" type="CharacteristicPointType" use="required" />
           </xs:complexType>
         </xs:element>
       </xs:sequence>
@@ -31,31 +31,31 @@
       <xs:sequence>
         <xs:element minOccurs="0" maxOccurs="unbounded" name="tnsbPrefixPLLine">
           <xs:complexType>
-            <xs:sequence minOccurs="0">
-              <xs:element minOccurs="0" maxOccurs="unbounded" name="tnsbPrefixPLPoint">
+            <xs:sequence minOccurs="1" maxOccurs="1">
+              <xs:element minOccurs="2" maxOccurs="unbounded" name="tnsbPrefixPLPoint">
                 <xs:complexType>
-                  <xs:attribute name="XCoord" type="xs:string" use="optional" />
-                  <xs:attribute name="YCoord" type="xs:string" use="optional" />
+                  <xs:attribute name="XCoord" type="xs:double" use="optional" />
+                  <xs:attribute name="YCoord" type="xs:double" use="optional" />
                 </xs:complexType>
               </xs:element>
             </xs:sequence>
-            <xs:attribute name="IsPhreatic" type="xs:string" use="optional" />
-            <xs:attribute name="BoundaryLayer" type="xs:string" use="optional" />
+            <xs:attribute name="IsPhreatic" type="xs:boolean" use="optional" />
+            <xs:attribute name="BoundaryLayer" type="xs:integer" use="required" />
           </xs:complexType>
         </xs:element>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="tnsbPrefixModel">
     <xs:complexType>
-      <xs:attribute name="CalculationModel" type="xs:string" use="optional" />
-      <xs:attribute name="ShearStrength" type="xs:string" use="optional" />
-      <xs:attribute name="Probabilistic" type="xs:string" use="optional" />
-      <xs:attribute name="SearchMethod" type="xs:string" use="optional" />
-      <xs:attribute name="GridPosition" type="xs:string" use="optional" />
+      <xs:attribute name="CalculationModel" type="ModelType" use="required" />
+      <xs:attribute name="ShearStrength" type="ShearStrengthType" use="required" />
+      <xs:attribute name="Probabilistic" type="xs:boolean" use="required" />
+      <xs:attribute name="SearchMethod" type="SearchMethodType" use="required" />
+      <xs:attribute name="GridPosition" type="GridPositionType" use="required" />
     </xs:complexType>
   </xs:element>
-  <xs:element name="tnsbPrefixTrafficLoad">
+  <xs:element name="tnsbPrefixTrafficLoad" nillable="true">
     <xs:complexType>
       <xs:attribute name="XCoordinateAtRiver" type="xs:string" use="optional" />
       <xs:attribute name="XCoordinateAtPolder" type="xs:string" use="optional" />
@@ -64,18 +64,18 @@
       <xs:attribute name="DegreeOfConsolidation" type="xs:string" use="optional" />
     </xs:complexType>
   </xs:element>
-  <xs:element name="tnsbPrefixCalculationOptions">
+  <xs:element name="tnsbPrefixCalculationOptions" nillable="true">
     <xs:complexType>
       <xs:attribute name="MinimalCircleDepth" type="xs:string" use="optional" />
       <xs:attribute name="ZonesType" type="xs:string" use="optional" />
     </xs:complexType>
   </xs:element>
   <xs:element name="tnsbPrefixGeometryCreationOptions">
     <xs:complexType>
-      <xs:attribute name="SoilGeometryType" type="xs:string" use="optional" />
-      <xs:attribute name="SoilGeometry2DFilename" type="xs:string" use="optional" />
-      <xs:attribute name="XOffsetSoilGeometry2DOrigin" type="xs:string" use="optional" />
-      <xs:attribute name="MaterialForDike" type="xs:string" use="optional" />
+      <xs:attribute name="SoilGeometryType" type="SoilGeometryType" use="required" />
+      <xs:attribute name="SoilGeometry2DFilename" type="xs:string" use="required" />
+      <xs:attribute name="XOffsetSoilGeometry2DOrigin" type="xs:double" use="required" />
+      <xs:attribute name="MaterialForDike" type="xs:string" use="required" />
       <xs:attribute name="MaterialForShoulder" type="xs:string" use="optional" />
       <xs:attribute name="IsDrySituation" type="xs:string" use="optional" />
       <xs:attribute name="PLLineAssignment" type="xs:string" use="optional" />
@@ -84,7 +84,7 @@
       <xs:attribute name="IsDesign" type="xs:string" use="optional" />
     </xs:complexType>
   </xs:element>
-  <xs:element name="tnsbPrefixHorizontalBalanceArea">
+  <xs:element name="tnsbPrefixHorizontalBalanceArea" nillable="true">
     <xs:complexType>
       <xs:attribute name="XLeft" type="xs:string" use="optional" />
       <xs:attribute name="XRight" type="xs:string" use="optional" />
@@ -95,24 +95,89 @@
   </xs:element>
   <xs:element name="tnsbPrefixSlipCircleDefinition">
     <xs:complexType>
-      <xs:attribute name="XCoordinateLastUpliftPoint" type="xs:string" use="optional" />
-      <xs:attribute name="UpliftVanTangentLinesDefinition" type="xs:string" use="optional" />
-      <xs:attribute name="UpliftVanTangentLinesDistance" type="xs:string" use="optional" />
-      <xs:attribute name="BishopTangentLinesDefinition" type="xs:string" use="optional" />
-      <xs:attribute name="BishopTangentLinesDistance" type="xs:string" use="optional" />
-      <xs:attribute name="GridSizeDetermination" type="xs:string" use="optional" />
-      <xs:attribute name="UpliftVanLeftGridVerticalPointCount" type="xs:string" use="optional" />
-      <xs:attribute name="UpliftVanLeftGridVerticalPointDistance" type="xs:string" use="optional" />
-      <xs:attribute name="UpliftVanLeftGridHorizontalPointCount" type="xs:string" use="optional" />
-      <xs:attribute name="UpliftVanLeftGridHorizontalPointDistance" type="xs:string" use="optional" />
-      <xs:attribute name="UpliftVanRightGridVerticalPointCount" type="xs:string" use="optional" />
-      <xs:attribute name="UpliftVanRightGridVerticalPointDistance" type="xs:string" use="optional" />
-      <xs:attribute name="UpliftVanRightGridHorizontalPointCount" type="xs:string" use="optional" />
-      <xs:attribute name="UpliftVanRightGridHorizontalPointDistance" type="xs:string" use="optional" />
-      <xs:attribute name="BishopGridVerticalPointCount" type="xs:string" use="optional" />
-      <xs:attribute name="BishopGridVerticalPointDistance" type="xs:string" use="optional" />
-      <xs:attribute name="BishopGridHorizontalPointCount" type="xs:string" use="optional" />
-      <xs:attribute name="BishopGridHorizontalPointDistance" type="xs:string" use="optional" />
+      <xs:attribute name="XCoordinateLastUpliftPoint" type="xs:double" use="required" />
+      <xs:attribute name="UpliftVanTangentLinesDefinition" type="TangentLinesDefinitionType" use="optional" />
+      <xs:attribute name="UpliftVanTangentLinesDistance" type="xs:double" use="optional" />
+      <xs:attribute name="BishopTangentLinesDefinition" type="TangentLinesDefinitionType" use="optional" />
+      <xs:attribute name="BishopTangentLinesDistance" type="xs:double" use="optional" />
+      <xs:attribute name="GridSizeDetermination" type="GridSizeDeterminationType" use="required" />
+      <xs:attribute name="UpliftVanLeftGridVerticalPointCount" type="xs:integer" use="optional" />
+      <xs:attribute name="UpliftVanLeftGridVerticalPointDistance" type="xs:double" use="optional" />
+      <xs:attribute name="UpliftVanLeftGridHorizontalPointCount" type="xs:integer" use="optional" />
+      <xs:attribute name="UpliftVanLeftGridHorizontalPointDistance" type="xs:double" use="optional" />
+      <xs:attribute name="UpliftVanRightGridVerticalPointCount" type="xs:integer" use="optional" />
+      <xs:attribute name="UpliftVanRightGridVerticalPointDistance" type="xs:double" use="optional" />
+      <xs:attribute name="UpliftVanRightGridHorizontalPointCount" type="xs:integer" use="optional" />
+      <xs:attribute name="UpliftVanRightGridHorizontalPointDistance" type="xs:double" use="optional" />
+      <xs:attribute name="BishopGridVerticalPointCount" type="xs:integer" use="optional" />
+      <xs:attribute name="BishopGridVerticalPointDistance" type="xs:double" use="optional" />
+      <xs:attribute name="BishopGridHorizontalPointCount" type="xs:integer" use="optional" />
+      <xs:attribute name="BishopGridHorizontalPointDistance" type="xs:double" use="optional" />
     </xs:complexType>
   </xs:element>
+  <xs:simpleType name="SoilGeometryType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="SoilGeometry1D" />
+      <xs:enumeration value="SoilGeometry2D" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="CharacteristicPointType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="None" />
+      <xs:enumeration value="SurfaceLevelOutside" />
+      <xs:enumeration value="DikeToeAtRiver" />
+      <xs:enumeration value="ShoulderTopOutside" />
+      <xs:enumeration value="ShoulderBaseOutside" />
+      <xs:enumeration value="DikeTopAtRiver" />
+      <xs:enumeration value="DikeLine" />
+      <xs:enumeration value="TrafficLoadOutside" />
+      <xs:enumeration value="TrafficLoadInside" />
+      <xs:enumeration value="DikeTopAtPolder" />
+      <xs:enumeration value="ShoulderBaseInside" />
+      <xs:enumeration value="ShoulderTopInside" />
+      <xs:enumeration value="DikeToeAtPolder" />
+      <xs:enumeration value="DitchDikeSide" />
+      <xs:enumeration value="BottomDitchDikeSide" />
+      <xs:enumeration value="BottomDitchPolderSide" />
+      <xs:enumeration value="DitchPolderSide" />
+      <xs:enumeration value="SurfaceLevelInside" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="ModelType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Bishop" />
+      <xs:enumeration value="UpliftVan" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="ShearStrengthType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="CPhi" />
+      <xs:enumeration value="CuCalculated" />
+      <xs:enumeration value="CuMeasured" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="SearchMethodType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Grid" />
+      <xs:enumeration value="GeneticAlgorithm" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="GridPositionType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Left" />
+      <xs:enumeration value="Right" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="GridSizeDeterminationType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Automatic" />
+      <xs:enumeration value="Specified" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="TangentLinesDefinitionType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="OnBoundaryLines" />
+      <xs:enumeration value="Specified" />
+    </xs:restriction>
+  </xs:simpleType>
 </xs:schema>
\ No newline at end of file
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/IoGeometryCreationOptions.cs
===================================================================
diff -u -r3117 -r3120
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/IoGeometryCreationOptions.cs	(.../IoGeometryCreationOptions.cs)	(revision 3117)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/IoGeometryCreationOptions.cs	(.../IoGeometryCreationOptions.cs)	(revision 3120)
@@ -23,6 +23,12 @@
 {
     public class IoGeometryCreationOptions
     {
-        
+        public SoilGeometryType SoilGeometryType { get; set; }
+
+        public string SoilGeometry2DFilename { get; set; }
+
+        public double XOffsetSoilGeometry2DOrigin { get; set; }
+
+        public string MaterialForDike { get; set; }
     }
 }
\ No newline at end of file
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io.Tests/MStabDamXmlSerializerTests.cs
===================================================================
diff -u -r3116 -r3120
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io.Tests/MStabDamXmlSerializerTests.cs	(.../MStabDamXmlSerializerTests.cs)	(revision 3116)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io.Tests/MStabDamXmlSerializerTests.cs	(.../MStabDamXmlSerializerTests.cs)	(revision 3120)
@@ -49,27 +49,27 @@
             DamMStabDoc.tnsPrefixDamMStabInput.tnsbPrefixSurfaceLine = surfaceLine;
             surfaceLine[0] = new tnsbPrefixSurfaceLineTnsbPrefixSurfacePoint()
             {
-                XCoord = "1.0",
-                YCoord = "2.0"
+                XCoord = 1.0,
+                YCoord = 2.0
             };
             surfaceLine[1] = new tnsbPrefixSurfaceLineTnsbPrefixSurfacePoint()
             {
-                XCoord = "3.0",
-                YCoord = "4.0"
+                XCoord = 3.0,
+                YCoord = 4.0
             };
 
             var characteristicPoints = new tnsbPrefixCharacteristicPointsTnsbPrefixCharacteristicPoint[2];
             characteristicPoints[0] = new tnsbPrefixCharacteristicPointsTnsbPrefixCharacteristicPoint()
             {
-                CharacteristicPointType = "SurfaceLevelOutside",
-                XCoord = "10.0",
-                YCoord = "20.0"
+                CharacteristicPointType = CharacteristicPointType.SurfaceLevelOutside,
+                XCoord = 10.0,
+                YCoord = 20.0
             };
             characteristicPoints[1] = new tnsbPrefixCharacteristicPointsTnsbPrefixCharacteristicPoint()
             {
-                CharacteristicPointType = "SurfaceLevelInside",
-                XCoord = "30.0",
-                YCoord = "40.0"
+                CharacteristicPointType = CharacteristicPointType.SurfaceLevelInside,
+                XCoord = 30.0,
+                YCoord = 40.0
             };
             DamMStabDoc.tnsPrefixDamMStabInput.tnsbPrefixCharacteristicPoints = characteristicPoints;
 
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillXmlDamMStabDocFromIo.cs
===================================================================
diff -u -r3117 -r3120
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillXmlDamMStabDocFromIo.cs	(.../FillXmlDamMStabDocFromIo.cs)	(revision 3117)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillXmlDamMStabDocFromIo.cs	(.../FillXmlDamMStabDocFromIo.cs)	(revision 3120)
@@ -29,7 +29,17 @@
         public static tnsPrefixDamMStabDoc FillXmlDamMStabDoc(IoMStabDamDoc ioDamMStabDamDoc)
         {
             var xmlDamMStabDoc = new tnsPrefixDamMStabDoc();
+            TransferGeometryCreationOptions(ioDamMStabDamDoc, xmlDamMStabDoc.tnsPrefixDamMStabInput.tnsbPrefixGeometryCreationOptions);
             return xmlDamMStabDoc;
         }
+
+        private static void TransferGeometryCreationOptions(IoMStabDamDoc ioDamMStabDamDoc,
+            tnsbPrefixGeometryCreationOptions geometryCreationOptions)
+        {
+            geometryCreationOptions.MaterialForDike = ioDamMStabDamDoc.MStabInput.GeometryCreationOptions.MaterialForDike;
+            geometryCreationOptions.SoilGeometry2DFilename = ioDamMStabDamDoc.MStabInput.GeometryCreationOptions.SoilGeometry2DFilename;
+            geometryCreationOptions.SoilGeometryType = ioDamMStabDamDoc.MStabInput.GeometryCreationOptions.SoilGeometryType;
+            geometryCreationOptions.XOffsetSoilGeometry2DOrigin = ioDamMStabDamDoc.MStabInput.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin;
+        }
     }
 }
\ No newline at end of file