Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r6087 -r6097
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 6087)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 6097)
@@ -208,25 +208,25 @@
             var timeSerieEntryIndex = 0;
             foreach (TimeSerieEntry timestepEntry in timeSerie.Entries)
             {
-                TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
-                if (timestepEntry.StochastValue != null)
-                {
-                    stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue
-                    {
-                        Distribution = timestepEntry.StochastValue.Distribution,
-                        Mean = timestepEntry.StochastValue.Mean,
-                        StandardDeviation = timestepEntry.StochastValue.StandardDeviation
-                    };
-                }
+                // TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
+                // if (timestepEntry.StochastValue != null)
+                // {
+                //     stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue
+                //     {
+                //         Distribution = timestepEntry.StochastValue.Distribution,
+                //         Mean = timestepEntry.StochastValue.Mean,
+                //         StandardDeviation = timestepEntry.StochastValue.StandardDeviation
+                //     };
+                // }
 
                 var timeStep = new TimeSerieEntriesTimeSerieEntry
                 {
                     DateTime = timestepEntry.DateTime,
-                    Value = timestepEntry.Value,
-                    BasisFileNameWMF = timestepEntry.BasisFileName,
-                    Flagnietechtgebruikt = timestepEntry.Flag,
-                    RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
-                    StochastValue = stochastValue
+                    Value = timestepEntry.Value
+                    // BasisFileNameWMF = timestepEntry.BasisFileName,
+                    // Flagnietechtgebruikt = timestepEntry.Flag,
+                    // RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
+                    // StochastValue = stochastValue
                 };
                 inputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep;
                 timeSerieEntryIndex++;
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs
===================================================================
diff -u -r6095 -r6097
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs	(.../DamOutput.cs)	(revision 6095)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs	(.../DamOutput.cs)	(revision 6097)
@@ -9,14 +9,14 @@
 //------------------------------------------------------------------------------
 
 // 
-// This source code was auto-generated by xsd, Version=4.8.3928.0.
+// This source code was auto-generated by xsd, Version=4.8.4084.0.
 // 
 namespace Deltares.DamEngine.Io.XmlOutput {
     using System.Xml.Serialization;
     
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -50,7 +50,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -59,6 +59,10 @@
         
         private DesignResult[] calculationResultsField;
         
+        private OutputResultsOperationalStaticData operationalStaticDataField;
+        
+        private OutputResultsOperationalLocationsStaticData operationalLocationsStaticDataField;
+        
         private TimeSerie[] operationalOutputTimeSeriesField;
         
         private Message[] calculationMessagesField;
@@ -75,6 +79,27 @@
         }
         
         /// <remarks/>
+        public OutputResultsOperationalStaticData OperationalStaticData {
+            get {
+                return this.operationalStaticDataField;
+            }
+            set {
+                this.operationalStaticDataField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
+        public OutputResultsOperationalLocationsStaticData OperationalLocationsStaticData {
+            get {
+                return this.operationalLocationsStaticDataField;
+            }
+            set {
+                this.operationalLocationsStaticDataField = value;
+            }
+        }
+        
+        /// <remarks/>
         [System.Xml.Serialization.XmlArrayAttribute(IsNullable=true)]
         [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)]
         public TimeSerie[] OperationalOutputTimeSeries {
@@ -99,7 +124,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -209,7 +234,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -345,7 +370,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -444,7 +469,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -478,7 +503,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum MessageMessageType {
@@ -494,10 +519,564 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class UpliftVanCalculatedSlipPlaneType {
+        
+        private Point2DType leftCenterField;
+        
+        private Point2DType rightCenterField;
+        
+        private double tangentHeightField;
+        
+        private double safetyFactorField;
+        
+        /// <remarks/>
+        public Point2DType LeftCenter {
+            get {
+                return this.leftCenterField;
+            }
+            set {
+                this.leftCenterField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public Point2DType RightCenter {
+            get {
+                return this.rightCenterField;
+            }
+            set {
+                this.rightCenterField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double TangentHeight {
+            get {
+                return this.tangentHeightField;
+            }
+            set {
+                this.tangentHeightField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double SafetyFactor {
+            get {
+                return this.safetyFactorField;
+            }
+            set {
+                this.safetyFactorField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Point2DType {
+        
+        private double xField;
+        
+        private double zField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double X {
+            get {
+                return this.xField;
+            }
+            set {
+                this.xField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double Z {
+            get {
+                return this.zField;
+            }
+            set {
+                this.zField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class BishopCalculatedSlipPlaneType {
+        
+        private Point2DType centerField;
+        
+        private double radiusField;
+        
+        private double safetyFactorField;
+        
+        /// <remarks/>
+        public Point2DType Center {
+            get {
+                return this.centerField;
+            }
+            set {
+                this.centerField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double Radius {
+            get {
+                return this.radiusField;
+            }
+            set {
+                this.radiusField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double SafetyFactor {
+            get {
+                return this.safetyFactorField;
+            }
+            set {
+                this.safetyFactorField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class UpliftVanCalculationGridType {
+        
+        private CalculationGridType leftGridField;
+        
+        private CalculationGridType rightGridField;
+        
+        private double[] tangentLinesField;
+        
+        /// <remarks/>
+        public CalculationGridType LeftGrid {
+            get {
+                return this.leftGridField;
+            }
+            set {
+                this.leftGridField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public CalculationGridType RightGrid {
+            get {
+                return this.rightGridField;
+            }
+            set {
+                this.rightGridField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("BoundaryHeight", IsNullable=false)]
+        public double[] TangentLines {
+            get {
+                return this.tangentLinesField;
+            }
+            set {
+                this.tangentLinesField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class CalculationGridType {
+        
+        private double gridXLeftField;
+        
+        private double gridXRightField;
+        
+        private double gridZTopField;
+        
+        private double gridZBottomField;
+        
+        private int gridXNumberField;
+        
+        private int gridZNumberField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double GridXLeft {
+            get {
+                return this.gridXLeftField;
+            }
+            set {
+                this.gridXLeftField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double GridXRight {
+            get {
+                return this.gridXRightField;
+            }
+            set {
+                this.gridXRightField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double GridZTop {
+            get {
+                return this.gridZTopField;
+            }
+            set {
+                this.gridZTopField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double GridZBottom {
+            get {
+                return this.gridZBottomField;
+            }
+            set {
+                this.gridZBottomField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public int GridXNumber {
+            get {
+                return this.gridXNumberField;
+            }
+            set {
+                this.gridXNumberField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public int GridZNumber {
+            get {
+                return this.gridZNumberField;
+            }
+            set {
+                this.gridZNumberField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class BishopCalculationGridType {
+        
+        private CalculationGridType gridField;
+        
+        private double[] tangentLinesField;
+        
+        private bool useFixedPointField;
+        
+        private double fixedPointXField;
+        
+        private bool fixedPointXFieldSpecified;
+        
+        private double fixedPointZField;
+        
+        private bool fixedPointZFieldSpecified;
+        
+        /// <remarks/>
+        public CalculationGridType Grid {
+            get {
+                return this.gridField;
+            }
+            set {
+                this.gridField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("BoundaryHeight", IsNullable=false)]
+        public double[] TangentLines {
+            get {
+                return this.tangentLinesField;
+            }
+            set {
+                this.tangentLinesField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public bool UseFixedPoint {
+            get {
+                return this.useFixedPointField;
+            }
+            set {
+                this.useFixedPointField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double FixedPointX {
+            get {
+                return this.fixedPointXField;
+            }
+            set {
+                this.fixedPointXField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool FixedPointXSpecified {
+            get {
+                return this.fixedPointXFieldSpecified;
+            }
+            set {
+                this.fixedPointXFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double FixedPointZ {
+            get {
+                return this.fixedPointZField;
+            }
+            set {
+                this.fixedPointZField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool FixedPointZSpecified {
+            get {
+                return this.fixedPointZFieldSpecified;
+            }
+            set {
+                this.fixedPointZFieldSpecified = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class WaternetLineType {
+        
+        private Point2DType[] pointsField;
+        
+        private string nameField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("Point", IsNullable=false)]
+        public Point2DType[] Points {
+            get {
+                return this.pointsField;
+            }
+            set {
+                this.pointsField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public string Name {
+            get {
+                return this.nameField;
+            }
+            set {
+                this.nameField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class HeadLineType {
+        
+        private WaternetLineType waternetLineField;
+        
+        private int keyField;
+        
+        /// <remarks/>
+        public WaternetLineType WaternetLine {
+            get {
+                return this.waternetLineField;
+            }
+            set {
+                this.waternetLineField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public int Key {
+            get {
+                return this.keyField;
+            }
+            set {
+                this.keyField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class WaternetType {
+        
+        private HeadLineType phreaticLineField;
+        
+        private HeadLineType[] headLinesField;
+        
+        private WaternetTypeWaternetLine[] waternetLinesField;
+        
+        private string nameField;
+        
+        private double unitWeightWaterField;
+        
+        private bool unitWeightWaterFieldSpecified;
+        
+        /// <remarks/>
+        public HeadLineType PhreaticLine {
+            get {
+                return this.phreaticLineField;
+            }
+            set {
+                this.phreaticLineField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("HeadLine", IsNullable=false)]
+        public HeadLineType[] HeadLines {
+            get {
+                return this.headLinesField;
+            }
+            set {
+                this.headLinesField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("WaternetLine", IsNullable=false)]
+        public WaternetTypeWaternetLine[] WaternetLines {
+            get {
+                return this.waternetLinesField;
+            }
+            set {
+                this.waternetLinesField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public string Name {
+            get {
+                return this.nameField;
+            }
+            set {
+                this.nameField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double UnitWeightWater {
+            get {
+                return this.unitWeightWaterField;
+            }
+            set {
+                this.unitWeightWaterField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool UnitWeightWaterSpecified {
+            get {
+                return this.unitWeightWaterFieldSpecified;
+            }
+            set {
+                this.unitWeightWaterFieldSpecified = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public partial class WaternetTypeWaternetLine : WaternetLineType {
+        
+        private int associatedHeadLineField;
+        
+        private bool associatedHeadLineFieldSpecified;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public int AssociatedHeadLine {
+            get {
+                return this.associatedHeadLineField;
+            }
+            set {
+                this.associatedHeadLineField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool AssociatedHeadLineSpecified {
+            get {
+                return this.associatedHeadLineFieldSpecified;
+            }
+            set {
+                this.associatedHeadLineFieldSpecified = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class TimeSerie {
         
         private TimeSerieTimeStep timeStepField;
@@ -747,7 +1326,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -821,7 +1400,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -843,176 +1422,257 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public partial class TimeSerieEntriesTimeSerieEntry {
         
-        private TimeSerieEntriesTimeSerieEntryStochastValue stochastValueField;
+        private WaternetType waternetField;
         
+        private BishopCalculationGridType bishopCalculationGridField;
+        
+        private UpliftVanCalculationGridType upliftVanCalculationGridField;
+        
+        private BishopCalculatedSlipPlaneType bishopCalculatedSlipPlaneField;
+        
+        private UpliftVanCalculatedSlipPlaneType upliftVanCalculatedSlipPlaneField;
+        
         private System.DateTime dateTimeField;
         
         private double valueField;
         
-        private int flagnietechtgebruiktField;
+        private bool isUpliftField;
         
-        private string basisFileNameWMFField;
+        private bool isUpliftFieldSpecified;
         
-        private string relativeCalculationPathNameField;
+        /// <remarks/>
+        public WaternetType Waternet {
+            get {
+                return this.waternetField;
+            }
+            set {
+                this.waternetField = value;
+            }
+        }
         
         /// <remarks/>
-        public TimeSerieEntriesTimeSerieEntryStochastValue StochastValue {
+        public BishopCalculationGridType BishopCalculationGrid {
             get {
-                return this.stochastValueField;
+                return this.bishopCalculationGridField;
             }
             set {
-                this.stochastValueField = value;
+                this.bishopCalculationGridField = value;
             }
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public System.DateTime DateTime {
+        public UpliftVanCalculationGridType UpliftVanCalculationGrid {
             get {
-                return this.dateTimeField;
+                return this.upliftVanCalculationGridField;
             }
             set {
-                this.dateTimeField = value;
+                this.upliftVanCalculationGridField = value;
             }
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Value {
+        public BishopCalculatedSlipPlaneType BishopCalculatedSlipPlane {
             get {
-                return this.valueField;
+                return this.bishopCalculatedSlipPlaneField;
             }
             set {
-                this.valueField = value;
+                this.bishopCalculatedSlipPlaneField = value;
             }
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute("Flag-nietechtgebruikt")]
-        public int Flagnietechtgebruikt {
+        public UpliftVanCalculatedSlipPlaneType UpliftVanCalculatedSlipPlane {
             get {
-                return this.flagnietechtgebruiktField;
+                return this.upliftVanCalculatedSlipPlaneField;
             }
             set {
-                this.flagnietechtgebruiktField = value;
+                this.upliftVanCalculatedSlipPlaneField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string BasisFileNameWMF {
+        public System.DateTime DateTime {
             get {
-                return this.basisFileNameWMFField;
+                return this.dateTimeField;
             }
             set {
-                this.basisFileNameWMFField = value;
+                this.dateTimeField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string RelativeCalculationPathName {
+        public double Value {
             get {
-                return this.relativeCalculationPathNameField;
+                return this.valueField;
             }
             set {
-                this.relativeCalculationPathNameField = value;
+                this.valueField = value;
             }
         }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public bool IsUplift {
+            get {
+                return this.isUpliftField;
+            }
+            set {
+                this.isUpliftField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool IsUpliftSpecified {
+            get {
+                return this.isUpliftFieldSpecified;
+            }
+            set {
+                this.isUpliftFieldSpecified = value;
+            }
+        }
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class TimeSerieEntriesTimeSerieEntryStochastValue {
+    public partial class OperationalStaticData {
         
-        private double meanField;
+        private OperationalStaticDataFailureMechanismSystemType failureMechanismSystemTypeField;
         
-        private double standardDeviationField;
+        private bool failureMechanismSystemTypeFieldSpecified;
         
-        private int distributionField;
+        private OperationalStaticDataStabilityModel stabilityModelField;
         
+        private bool stabilityModelFieldSpecified;
+        
+        private OperationalStaticDataSearchAlgorithm searchAlgorithmField;
+        
+        private bool searchAlgorithmFieldSpecified;
+        
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Mean {
+        public OperationalStaticDataFailureMechanismSystemType FailureMechanismSystemType {
             get {
-                return this.meanField;
+                return this.failureMechanismSystemTypeField;
             }
             set {
-                this.meanField = value;
+                this.failureMechanismSystemTypeField = value;
             }
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double StandardDeviation {
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool FailureMechanismSystemTypeSpecified {
             get {
-                return this.standardDeviationField;
+                return this.failureMechanismSystemTypeFieldSpecified;
             }
             set {
-                this.standardDeviationField = value;
+                this.failureMechanismSystemTypeFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int Distribution {
+        public OperationalStaticDataStabilityModel StabilityModel {
             get {
-                return this.distributionField;
+                return this.stabilityModelField;
             }
             set {
-                this.distributionField = value;
+                this.stabilityModelField = value;
             }
         }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class Point2DType {
         
-        private double xField;
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool StabilityModelSpecified {
+            get {
+                return this.stabilityModelFieldSpecified;
+            }
+            set {
+                this.stabilityModelFieldSpecified = value;
+            }
+        }
         
-        private double zField;
-        
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double X {
+        public OperationalStaticDataSearchAlgorithm SearchAlgorithm {
             get {
-                return this.xField;
+                return this.searchAlgorithmField;
             }
             set {
-                this.xField = value;
+                this.searchAlgorithmField = value;
             }
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Z {
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool SearchAlgorithmSpecified {
             get {
-                return this.zField;
+                return this.searchAlgorithmFieldSpecified;
             }
             set {
-                this.zField = value;
+                this.searchAlgorithmFieldSpecified = value;
             }
         }
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public enum OperationalStaticDataFailureMechanismSystemType {
+        
+        /// <remarks/>
+        StabilityInside,
+        
+        /// <remarks/>
+        StabilityOutside,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public enum OperationalStaticDataStabilityModel {
+        
+        /// <remarks/>
+        Bishop,
+        
+        /// <remarks/>
+        UpliftVan,
+        
+        /// <remarks/>
+        BishopUpliftVan,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public enum OperationalStaticDataSearchAlgorithm {
+        
+        /// <remarks/>
+        Grid,
+        
+        /// <remarks/>
+        Beeswarm,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class SliceType {
@@ -1860,7 +2520,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     public enum ShearStrengthModelType {
         
@@ -1878,7 +2538,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SlidingPlaneMinimumSafetyCurveType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(DualSlidingCircleMinimumSafetyCurveType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SlidingCircleMinimumSafetyCurveType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1912,7 +2572,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1921,7 +2581,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1942,7 +2602,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2323,7 +2983,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2641,7 +3301,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2675,7 +3335,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2723,7 +3383,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum DesignResultStabilityDesignResultsStabilityModelType {
@@ -2739,7 +3399,7 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3381,4 +4041,156 @@
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public partial class OutputResultsOperationalStaticData {
+        
+        private OperationalStaticData operationalStaticDataField;
+        
+        /// <remarks/>
+        public OperationalStaticData OperationalStaticData {
+            get {
+                return this.operationalStaticDataField;
+            }
+            set {
+                this.operationalStaticDataField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public partial class OutputResultsOperationalLocationsStaticData {
+        
+        private OutputResultsOperationalLocationsStaticDataOperationalLocationStaticData[] operationalLocationStaticDataField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("OperationalLocationStaticData")]
+        public OutputResultsOperationalLocationsStaticDataOperationalLocationStaticData[] OperationalLocationStaticData {
+            get {
+                return this.operationalLocationStaticDataField;
+            }
+            set {
+                this.operationalLocationStaticDataField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public partial class OutputResultsOperationalLocationsStaticDataOperationalLocationStaticData {
+        
+        private TrafficLoadTypeTrafficLoad[] trafficLoadField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("TrafficLoad", IsNullable=false)]
+        public TrafficLoadTypeTrafficLoad[] TrafficLoad {
+            get {
+                return this.trafficLoadField;
+            }
+            set {
+                this.trafficLoadField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public partial class TrafficLoadTypeTrafficLoad {
+        
+        private int keyField;
+        
+        private double magnitudeField;
+        
+        private double distributionAngleField;
+        
+        private string loadTypeField;
+        
+        private double xStartField;
+        
+        private double xEndField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public int Key {
+            get {
+                return this.keyField;
+            }
+            set {
+                this.keyField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double Magnitude {
+            get {
+                return this.magnitudeField;
+            }
+            set {
+                this.magnitudeField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double DistributionAngle {
+            get {
+                return this.distributionAngleField;
+            }
+            set {
+                this.distributionAngleField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public string LoadType {
+            get {
+                return this.loadTypeField;
+            }
+            set {
+                this.loadTypeField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double XStart {
+            get {
+                return this.xStartField;
+            }
+            set {
+                this.xStartField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double XEnd {
+            get {
+                return this.xEndField;
+            }
+            set {
+                this.xEndField = value;
+            }
+        }
+    }
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r5813 -r6097
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 5813)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 6097)
@@ -1156,29 +1156,75 @@
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public partial class TimeSerieEntriesTimeSerieEntry {
         
-        private TimeSerieEntriesTimeSerieEntryStochastValue stochastValueField;
+        private WaternetType waternetField;
         
+        private BishopCalculationGridType bishopCalculationGridField;
+        
+        private UpliftVanCalculationGridType upliftVanCalculationGridField;
+        
+        private BishopCalculatedSlipPlaneType bishopCalculatedSlipPlaneField;
+        
+        private UpliftVanCalculatedSlipPlaneType upliftVanCalculatedSlipPlaneField;
+        
         private System.DateTime dateTimeField;
         
         private double valueField;
         
-        private int flagnietechtgebruiktField;
+        private bool isUpliftField;
         
-        private string basisFileNameWMFField;
+        private bool isUpliftFieldSpecified;
         
-        private string relativeCalculationPathNameField;
+        /// <remarks/>
+        public WaternetType Waternet {
+            get {
+                return this.waternetField;
+            }
+            set {
+                this.waternetField = value;
+            }
+        }
         
         /// <remarks/>
-        public TimeSerieEntriesTimeSerieEntryStochastValue StochastValue {
+        public BishopCalculationGridType BishopCalculationGrid {
             get {
-                return this.stochastValueField;
+                return this.bishopCalculationGridField;
             }
             set {
-                this.stochastValueField = value;
+                this.bishopCalculationGridField = value;
             }
         }
         
         /// <remarks/>
+        public UpliftVanCalculationGridType UpliftVanCalculationGrid {
+            get {
+                return this.upliftVanCalculationGridField;
+            }
+            set {
+                this.upliftVanCalculationGridField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public BishopCalculatedSlipPlaneType BishopCalculatedSlipPlane {
+            get {
+                return this.bishopCalculatedSlipPlaneField;
+            }
+            set {
+                this.bishopCalculatedSlipPlaneField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public UpliftVanCalculatedSlipPlaneType UpliftVanCalculatedSlipPlane {
+            get {
+                return this.upliftVanCalculatedSlipPlaneField;
+            }
+            set {
+                this.upliftVanCalculatedSlipPlaneField = value;
+            }
+        }
+        
+        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public System.DateTime DateTime {
             get {
@@ -1201,92 +1247,587 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute("Flag-nietechtgebruikt")]
-        public int Flagnietechtgebruikt {
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public bool IsUplift {
             get {
-                return this.flagnietechtgebruiktField;
+                return this.isUpliftField;
             }
             set {
-                this.flagnietechtgebruiktField = value;
+                this.isUpliftField = value;
             }
         }
         
         /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool IsUpliftSpecified {
+            get {
+                return this.isUpliftFieldSpecified;
+            }
+            set {
+                this.isUpliftFieldSpecified = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class WaternetType {
+        
+        private HeadLineType phreaticLineField;
+        
+        private HeadLineType[] headLinesField;
+        
+        private WaternetTypeWaternetLine[] waternetLinesField;
+        
+        private string nameField;
+        
+        private double unitWeightWaterField;
+        
+        private bool unitWeightWaterFieldSpecified;
+        
+        /// <remarks/>
+        public HeadLineType PhreaticLine {
+            get {
+                return this.phreaticLineField;
+            }
+            set {
+                this.phreaticLineField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("HeadLine", IsNullable=false)]
+        public HeadLineType[] HeadLines {
+            get {
+                return this.headLinesField;
+            }
+            set {
+                this.headLinesField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("WaternetLine", IsNullable=false)]
+        public WaternetTypeWaternetLine[] WaternetLines {
+            get {
+                return this.waternetLinesField;
+            }
+            set {
+                this.waternetLinesField = value;
+            }
+        }
+        
+        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string BasisFileNameWMF {
+        public string Name {
             get {
-                return this.basisFileNameWMFField;
+                return this.nameField;
             }
             set {
-                this.basisFileNameWMFField = value;
+                this.nameField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string RelativeCalculationPathName {
+        public double UnitWeightWater {
             get {
-                return this.relativeCalculationPathNameField;
+                return this.unitWeightWaterField;
             }
             set {
-                this.relativeCalculationPathNameField = value;
+                this.unitWeightWaterField = value;
             }
         }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool UnitWeightWaterSpecified {
+            get {
+                return this.unitWeightWaterFieldSpecified;
+            }
+            set {
+                this.unitWeightWaterFieldSpecified = value;
+            }
+        }
     }
     
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class HeadLineType {
+        
+        private WaternetLineType waternetLineField;
+        
+        private int keyField;
+        
+        /// <remarks/>
+        public WaternetLineType WaternetLine {
+            get {
+                return this.waternetLineField;
+            }
+            set {
+                this.waternetLineField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public int Key {
+            get {
+                return this.keyField;
+            }
+            set {
+                this.keyField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class WaternetLineType {
+        
+        private Point2DType[] pointsField;
+        
+        private string nameField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("Point", IsNullable=false)]
+        public Point2DType[] Points {
+            get {
+                return this.pointsField;
+            }
+            set {
+                this.pointsField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public string Name {
+            get {
+                return this.nameField;
+            }
+            set {
+                this.nameField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Point2DType {
+        
+        private double xField;
+        
+        private double zField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double X {
+            get {
+                return this.xField;
+            }
+            set {
+                this.xField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double Z {
+            get {
+                return this.zField;
+            }
+            set {
+                this.zField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class TimeSerieEntriesTimeSerieEntryStochastValue {
+    public partial class WaternetTypeWaternetLine : WaternetLineType {
         
-        private double meanField;
+        private int associatedHeadLineField;
         
-        private double standardDeviationField;
+        private bool associatedHeadLineFieldSpecified;
         
-        private int distributionField;
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public int AssociatedHeadLine {
+            get {
+                return this.associatedHeadLineField;
+            }
+            set {
+                this.associatedHeadLineField = value;
+            }
+        }
         
         /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool AssociatedHeadLineSpecified {
+            get {
+                return this.associatedHeadLineFieldSpecified;
+            }
+            set {
+                this.associatedHeadLineFieldSpecified = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class BishopCalculationGridType {
+        
+        private CalculationGridType gridField;
+        
+        private double[] tangentLinesField;
+        
+        private bool useFixedPointField;
+        
+        private double fixedPointXField;
+        
+        private bool fixedPointXFieldSpecified;
+        
+        private double fixedPointZField;
+        
+        private bool fixedPointZFieldSpecified;
+        
+        /// <remarks/>
+        public CalculationGridType Grid {
+            get {
+                return this.gridField;
+            }
+            set {
+                this.gridField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("BoundaryHeight", IsNullable=false)]
+        public double[] TangentLines {
+            get {
+                return this.tangentLinesField;
+            }
+            set {
+                this.tangentLinesField = value;
+            }
+        }
+        
+        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Mean {
+        public bool UseFixedPoint {
             get {
-                return this.meanField;
+                return this.useFixedPointField;
             }
             set {
-                this.meanField = value;
+                this.useFixedPointField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double StandardDeviation {
+        public double FixedPointX {
             get {
-                return this.standardDeviationField;
+                return this.fixedPointXField;
             }
             set {
-                this.standardDeviationField = value;
+                this.fixedPointXField = value;
             }
         }
         
         /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool FixedPointXSpecified {
+            get {
+                return this.fixedPointXFieldSpecified;
+            }
+            set {
+                this.fixedPointXFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int Distribution {
+        public double FixedPointZ {
             get {
-                return this.distributionField;
+                return this.fixedPointZField;
             }
             set {
-                this.distributionField = value;
+                this.fixedPointZField = value;
             }
         }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool FixedPointZSpecified {
+            get {
+                return this.fixedPointZFieldSpecified;
+            }
+            set {
+                this.fixedPointZFieldSpecified = value;
+            }
+        }
     }
     
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class CalculationGridType {
+        
+        private double gridXLeftField;
+        
+        private double gridXRightField;
+        
+        private double gridZTopField;
+        
+        private double gridZBottomField;
+        
+        private int gridXNumberField;
+        
+        private int gridZNumberField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double GridXLeft {
+            get {
+                return this.gridXLeftField;
+            }
+            set {
+                this.gridXLeftField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double GridXRight {
+            get {
+                return this.gridXRightField;
+            }
+            set {
+                this.gridXRightField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double GridZTop {
+            get {
+                return this.gridZTopField;
+            }
+            set {
+                this.gridZTopField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double GridZBottom {
+            get {
+                return this.gridZBottomField;
+            }
+            set {
+                this.gridZBottomField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public int GridXNumber {
+            get {
+                return this.gridXNumberField;
+            }
+            set {
+                this.gridXNumberField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public int GridZNumber {
+            get {
+                return this.gridZNumberField;
+            }
+            set {
+                this.gridZNumberField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class UpliftVanCalculationGridType {
+        
+        private CalculationGridType leftGridField;
+        
+        private CalculationGridType rightGridField;
+        
+        private double[] tangentLinesField;
+        
+        /// <remarks/>
+        public CalculationGridType LeftGrid {
+            get {
+                return this.leftGridField;
+            }
+            set {
+                this.leftGridField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public CalculationGridType RightGrid {
+            get {
+                return this.rightGridField;
+            }
+            set {
+                this.rightGridField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("BoundaryHeight", IsNullable=false)]
+        public double[] TangentLines {
+            get {
+                return this.tangentLinesField;
+            }
+            set {
+                this.tangentLinesField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class BishopCalculatedSlipPlaneType {
+        
+        private Point2DType centerField;
+        
+        private double radiusField;
+        
+        private double safetyFactorField;
+        
+        /// <remarks/>
+        public Point2DType Center {
+            get {
+                return this.centerField;
+            }
+            set {
+                this.centerField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double Radius {
+            get {
+                return this.radiusField;
+            }
+            set {
+                this.radiusField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double SafetyFactor {
+            get {
+                return this.safetyFactorField;
+            }
+            set {
+                this.safetyFactorField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class UpliftVanCalculatedSlipPlaneType {
+        
+        private Point2DType leftCenterField;
+        
+        private Point2DType rightCenterField;
+        
+        private double tangentHeightField;
+        
+        private double safetyFactorField;
+        
+        /// <remarks/>
+        public Point2DType LeftCenter {
+            get {
+                return this.leftCenterField;
+            }
+            set {
+                this.leftCenterField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public Point2DType RightCenter {
+            get {
+                return this.rightCenterField;
+            }
+            set {
+                this.rightCenterField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double TangentHeight {
+            get {
+                return this.tangentHeightField;
+            }
+            set {
+                this.tangentHeightField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double SafetyFactor {
+            get {
+                return this.safetyFactorField;
+            }
+            set {
+                this.safetyFactorField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class StabilityParameters {
         
         private int searchMethodField;
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile2DTests.cs
===================================================================
diff -u -r6095 -r6097
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile2DTests.cs	(.../OperationalStabilityProfile2DTests.cs)	(revision 6095)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile2DTests.cs	(.../OperationalStabilityProfile2DTests.cs)	(revision 6097)
@@ -33,6 +33,8 @@
 using NUnit.Framework;
 using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType;
 using SurfaceLinePoint = Deltares.DamEngine.Io.XmlInput.SurfaceLinePoint;
+using WaternetLineType = Deltares.MacroStability.Io.XmlInput.WaternetLineType;
+using WaternetType = Deltares.MacroStability.Io.XmlInput.WaternetType;
 
 namespace Deltares.DamEngine.IntegrationTests.IntegrationTests;
 
Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
===================================================================
diff -u -r6086 -r6097
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs	(.../FactoryForDamProjectData.cs)	(revision 6086)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs	(.../FactoryForDamProjectData.cs)	(revision 6097)
@@ -203,10 +203,10 @@
                 {
                     DateTime = new DateTime(2012, 12, 31, 1, j * 10, 0),
                     Value = j,
-                    Flag = 1,
-                    BasisFileName = $"BasisFileName{i}",
-                    RelativeCalculationPathName = $"RelativeCalculationPathName{i}",
-                    StochastValue = stochastValue
+                    // Flag = 1,
+                    // BasisFileName = $"BasisFileName{i}",
+                    // RelativeCalculationPathName = $"RelativeCalculationPathName{i}",
+                    // StochastValue = stochastValue
                 });
             }
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
===================================================================
diff -u -r6095 -r6097
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 6095)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 6097)
@@ -474,25 +474,25 @@
             var timeSerieEntryIndex = 0;
             foreach (TimeSerieEntry timestepEntry in damTimeSerie.Entries)
             {
-                TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
-                if (timestepEntry.StochastValue != null)
-                {
-                    stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue
-                    {
-                        Distribution = timestepEntry.StochastValue.Distribution,
-                        Mean = timestepEntry.StochastValue.Mean,
-                        StandardDeviation = timestepEntry.StochastValue.StandardDeviation
-                    };
-                }
+                // TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
+                // if (timestepEntry.StochastValue != null)
+                // {
+                //     stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue
+                //     {
+                //         Distribution = timestepEntry.StochastValue.Distribution,
+                //         Mean = timestepEntry.StochastValue.Mean,
+                //         StandardDeviation = timestepEntry.StochastValue.StandardDeviation
+                //     };
+                // }
 
                 var timeStep = new TimeSerieEntriesTimeSerieEntry
                 {
                     DateTime = timestepEntry.DateTime,
-                    Value = timestepEntry.Value,
-                    BasisFileNameWMF = timestepEntry.BasisFileName,
-                    Flagnietechtgebruikt = timestepEntry.Flag,
-                    RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
-                    StochastValue = stochastValue
+                    Value = timestepEntry.Value
+                    // BasisFileNameWMF = timestepEntry.BasisFileName,
+                    // Flagnietechtgebruikt = timestepEntry.Flag,
+                    // RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
+                    // StochastValue = stochastValue
                 };
                 outputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep;
                 timeSerieEntryIndex++;
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r6087 -r6097
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 6087)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 6097)
@@ -227,25 +227,25 @@
                 for (var i = 0; i < inputTimeSerie.Entries.TimeSerieEntry.Length; i++)
                 {
                     TimeSerieEntriesTimeSerieEntry entry = inputTimeSerie.Entries.TimeSerieEntry[i];
-                    Stochast stochastValue = null;
-                    if (entry.StochastValue != null)
-                    {
-                        stochastValue = new Stochast
-                        {
-                            Distribution = entry.StochastValue.Distribution,
-                            Mean = entry.StochastValue.Mean,
-                            StandardDeviation = entry.StochastValue.StandardDeviation
-                        };
-                    }
+                    // Stochast stochastValue = null;
+                    // if (entry.StochastValue != null)
+                    // {
+                    //     stochastValue = new Stochast
+                    //     {
+                    //         Distribution = entry.StochastValue.Distribution,
+                    //         Mean = entry.StochastValue.Mean,
+                    //         StandardDeviation = entry.StochastValue.StandardDeviation
+                    //     };
+                    // }
 
                     var timeSerieEntry = new TimeSerieEntry
                     {
                         DateTime = entry.DateTime,
-                        Value = entry.Value,
-                        BasisFileName = entry.BasisFileNameWMF,
-                        Flag = entry.Flagnietechtgebruikt,
-                        RelativeCalculationPathName = entry.RelativeCalculationPathName,
-                        StochastValue = stochastValue
+                        Value = entry.Value
+                        // BasisFileName = entry.BasisFileNameWMF,
+                        // Flag = entry.Flagnietechtgebruikt,
+                        // RelativeCalculationPathName = entry.RelativeCalculationPathName,
+                        // StochastValue = stochastValue
                     };
                     timeSerie.Entries.Add(timeSerieEntry);
                 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
===================================================================
diff -u -r6095 -r6097
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs	(.../FillXmlOutputFromDamTests.cs)	(revision 6095)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs	(.../FillXmlOutputFromDamTests.cs)	(revision 6097)
@@ -310,8 +310,8 @@
                 {
                     DateTime = new DateTime(2012, 12, 31, 1, j * 10, 0),
                     Value = 1 + j * 0.1,
-                    Flag = 1,
-                    BasisFileName = $"BasisFileName{i}"
+                    // Flag = 1,
+                    // BasisFileName = $"BasisFileName{i}"
                 });
             }
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs
===================================================================
diff -u -r6095 -r6097
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs	(.../OperationalStabilityProfile1DTests.cs)	(revision 6095)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs	(.../OperationalStabilityProfile1DTests.cs)	(revision 6097)
@@ -33,6 +33,7 @@
 using KellermanSoftware.CompareNetObjects;
 using NUnit.Framework;
 using Point2DType = Deltares.DamEngine.Io.XmlOutput.Point2DType;
+using WaternetType = Deltares.MacroStability.Io.XmlInput.WaternetType;
 
 namespace Deltares.DamEngine.IntegrationTests.IntegrationTests;
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs
===================================================================
diff -u -r6095 -r6097
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs	(.../FillDamFromXmlOutput.cs)	(revision 6095)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs	(.../FillDamFromXmlOutput.cs)	(revision 6097)
@@ -95,25 +95,25 @@
             for (var i = 0; i < outputTimeSerie.Entries.TimeSerieEntry.Length; i++)
             {
                 TimeSerieEntriesTimeSerieEntry entry = outputTimeSerie.Entries.TimeSerieEntry[i];
-                Stochast stochastValue = null;
-                if (entry.StochastValue != null)
-                {
-                    stochastValue = new Stochast
-                    {
-                        Distribution = entry.StochastValue.Distribution,
-                        Mean = entry.StochastValue.Mean,
-                        StandardDeviation = entry.StochastValue.StandardDeviation
-                    };
-                }
+                // Stochast stochastValue = null;
+                // if (entry.StochastValue != null)
+                // {
+                //     stochastValue = new Stochast
+                //     {
+                //         Distribution = entry.StochastValue.Distribution,
+                //         Mean = entry.StochastValue.Mean,
+                //         StandardDeviation = entry.StochastValue.StandardDeviation
+                //     };
+                // }
 
                 var timeSerieEntry = new TimeSerieEntry
                 {
                     DateTime = entry.DateTime,
-                    Value = entry.Value,
-                    BasisFileName = entry.BasisFileNameWMF,
-                    Flag = entry.Flagnietechtgebruikt,
-                    RelativeCalculationPathName = entry.RelativeCalculationPathName,
-                    StochastValue = stochastValue
+                    Value = entry.Value
+                    // BasisFileName = entry.BasisFileNameWMF,
+                    // Flag = entry.Flagnietechtgebruikt,
+                    // RelativeCalculationPathName = entry.RelativeCalculationPathName,
+                    // StochastValue = stochastValue
                 };
                 timeSerie.Entries.Add(timeSerieEntry);
             }