Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r1165 -r1171
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 1165)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 1171)
@@ -289,8 +289,6 @@
         
         private LocationGeneral generalField;
         
-        private LocationPipingProbabilisticParameters pipingProbabilisticParametersField;
-        
         private LocationDesignScenario[] designScenariosField;
         
         private LocationStabilityOptions stabilityOptionsField;
@@ -372,16 +370,6 @@
         }
         
         /// <remarks/>
-        public LocationPipingProbabilisticParameters PipingProbabilisticParameters {
-            get {
-                return this.pipingProbabilisticParametersField;
-            }
-            set {
-                this.pipingProbabilisticParametersField = value;
-            }
-        }
-        
-        /// <remarks/>
         [System.Xml.Serialization.XmlArrayItemAttribute("DesignScenario", IsNullable=false)]
         public LocationDesignScenario[] DesignScenarios {
             get {
@@ -403,7 +391,6 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
         public LocationModelFactors ModelFactors {
             get {
                 return this.modelFactorsField;
@@ -3079,114 +3066,6 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class LocationPipingProbabilisticParameters {
-        
-        private LocationPipingProbabilisticParametersLayerHeightDistribution layerHeightDistributionField;
-        
-        private double layerHeightDeviationField;
-        
-        private bool layerHeightDeviationFieldSpecified;
-        
-        public LocationPipingProbabilisticParameters() {
-            this.layerHeightDistributionField = LocationPipingProbabilisticParametersLayerHeightDistribution.Deterministic;
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        [System.ComponentModel.DefaultValueAttribute(LocationPipingProbabilisticParametersLayerHeightDistribution.Deterministic)]
-        public LocationPipingProbabilisticParametersLayerHeightDistribution LayerHeightDistribution {
-            get {
-                return this.layerHeightDistributionField;
-            }
-            set {
-                this.layerHeightDistributionField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LayerHeightDeviation {
-            get {
-                return this.layerHeightDeviationField;
-            }
-            set {
-                this.layerHeightDeviationField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LayerHeightDeviationSpecified {
-            get {
-                return this.layerHeightDeviationFieldSpecified;
-            }
-            set {
-                this.layerHeightDeviationFieldSpecified = value;
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
-    [System.SerializableAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public enum LocationPipingProbabilisticParametersLayerHeightDistribution {
-        
-        /// <remarks/>
-        Deterministic,
-        
-        /// <remarks/>
-        Uniform,
-        
-        /// <remarks/>
-        Triangular,
-        
-        /// <remarks/>
-        Normal,
-        
-        /// <remarks/>
-        LogNormal,
-        
-        /// <remarks/>
-        Exponential,
-        
-        /// <remarks/>
-        Gamma,
-        
-        /// <remarks/>
-        Beta,
-        
-        /// <remarks/>
-        Frechet,
-        
-        /// <remarks/>
-        Weibull,
-        
-        /// <remarks/>
-        Gumbel,
-        
-        /// <remarks/>
-        Rayleigh,
-        
-        /// <remarks/>
-        Pareto,
-        
-        /// <remarks/>
-        TruncatedNormal,
-        
-        /// <remarks/>
-        Table,
-        
-        /// <remarks/>
-        StudentT,
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public partial class LocationDesignScenario {
         
         private string idField;
Index: DamEngine/trunk/xsd/DamLocation.xsd
===================================================================
diff -u -r1165 -r1171
--- DamEngine/trunk/xsd/DamLocation.xsd	(.../DamLocation.xsd)	(revision 1165)
+++ DamEngine/trunk/xsd/DamLocation.xsd	(.../DamLocation.xsd)	(revision 1171)
@@ -3,7 +3,7 @@
 <xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:complexType name="Location">
     <xs:sequence>
-      <xs:element name="AssesmentRegionalOptions">
+      <xs:element minOccurs="0" maxOccurs="1" name="AssesmentRegionalOptions">
         <xs:complexType>
           <xs:attribute default="Clay" name="DikeMaterialType" use="optional">
             <xs:simpleType>
@@ -25,8 +25,8 @@
         </xs:complexType>
       </xs:element>
       <xs:element name="AssesmentOptions" />
-      <xs:element name="OperationalOptions" />
-      <xs:element name="DesignOptions">
+      <xs:element minOccurs="0" maxOccurs="1" name="OperationalOptions" />
+      <xs:element minOccurs="0" maxOccurs="1" name="DesignOptions">
         <xs:complexType>
           <xs:attribute name="RedesignDikeHeight" type="xs:boolean" use="required" />
           <xs:attribute name="RedesignDikeShoulder" type="xs:boolean" use="required" />
@@ -117,33 +117,6 @@
           <xs:attribute name="HeadPL4" type="xs:double" use="optional" />
         </xs:complexType>
       </xs:element>
-      <xs:element name="PipingProbabilisticParameters">
-        <xs:complexType>
-          <xs:attribute default="Deterministic" name="LayerHeightDistribution">
-            <xs:simpleType>
-              <xs:restriction base="xs:string">
-                <xs:enumeration value="Deterministic" />
-                <xs:enumeration value="Uniform" />
-                <xs:enumeration value="Triangular" />
-                <xs:enumeration value="Normal" />
-                <xs:enumeration value="LogNormal" />
-                <xs:enumeration value="Exponential" />
-                <xs:enumeration value="Gamma" />
-                <xs:enumeration value="Beta" />
-                <xs:enumeration value="Frechet" />
-                <xs:enumeration value="Weibull" />
-                <xs:enumeration value="Gumbel" />
-                <xs:enumeration value="Rayleigh" />
-                <xs:enumeration value="Pareto" />
-                <xs:enumeration value="TruncatedNormal" />
-                <xs:enumeration value="Table" />
-                <xs:enumeration value="StudentT" />
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:attribute>
-          <xs:attribute name="LayerHeightDeviation" type="xs:double" />
-        </xs:complexType>
-      </xs:element>
       <xs:element name="DesignScenarios">
         <xs:complexType>
           <xs:sequence>
@@ -190,7 +163,7 @@
           <xs:attribute name="MinimumCircleDepth" type="xs:double" use="optional" />
         </xs:complexType>
       </xs:element>
-      <xs:element name="ModelFactors" nillable="true">
+      <xs:element minOccurs="0" maxOccurs="1" name="ModelFactors">
         <xs:complexType>
           <xs:attribute name="RequiredSafetyFactorStabilityInnerSlope" type="xs:double" use="optional" />
           <xs:attribute name="RequiredSafetyFactorStabilityOuterSlope" type="xs:double" use="optional" />