Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -rae6ef0985e7b64acca060b6782e21a3446548366 -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ae6ef0985e7b64acca060b6782e21a3446548366)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -1,25 +1,4 @@
-// Copyright (C) Stichting Deltares 2016. All rights reserved.
-//
-// This file is part of Ringtoets.
-//
-// Ringtoets is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-// All names, logos, and references to "Deltares" are registered trademarks of
-// Stichting Deltares and remain full property of Stichting Deltares at all times.
-// All rights reserved.
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -1235,6 +1214,50 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///
+        ///&lt;!--
+        ///Copyright (C) Stichting Deltares 2016. All rights reserved.
+        ///
+        ///This file is part of Ringtoets.
+        ///
+        ///Ringtoets is free software: you can redistribute it and/or modify
+        ///it under the terms of the GNU General Public License as published by
+        ///the Free Software Foundation, either version 3 of the License, or
+        ///(at your option) any later version.
+        ///
+        ///This program is distributed in the hope that it will be useful,
+        ///but WITHOUT ANY WARRANTY; without even the implied warrant [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string StochastStandardDeviationSchema {
+            get {
+                return ResourceManager.GetString("StochastStandardDeviationSchema", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///
+        ///&lt;!--
+        ///Copyright (C) Stichting Deltares 2016. All rights reserved.
+        ///
+        ///This file is part of Ringtoets.
+        ///
+        ///Ringtoets is free software: you can redistribute it and/or modify
+        ///it under the terms of the GNU General Public License as published by
+        ///the Free Software Foundation, either version 3 of the License, or
+        ///(at your option) any later version.
+        ///
+        ///This program is distributed in the hope that it will be useful,
+        ///but WITHOUT ANY WARRANTY; without even the implied warrant [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string StochastVariationCoefficientSchema {
+            get {
+                return ResourceManager.GetString("StochastVariationCoefficientSchema", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to De kolom &apos;{0}&apos; mag maar één keer gedefinieerd zijn..
         /// </summary>
         public static string StructuresCharacteristicsCsvReader_Column_0_must_be_defined_only_once {
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx
===================================================================
diff -u -rae6ef0985e7b64acca060b6782e21a3446548366 -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision ae6ef0985e7b64acca060b6782e21a3446548366)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -559,4 +559,10 @@
   <data name="Importer_LogMessageText_Update_of_TypeDescriptor_0_cancelled" xml:space="preserve">
     <value>{0} bijwerken afgebroken. Geen data ingelezen.</value>
   </data>
+  <data name="StochastStandardDeviationSchema" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\stochaststandarddeviationschema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="StochastVariationCoefficientSchema" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\stochastvariationcoefficientschema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Resources/StochastSchema.xsd
===================================================================
diff -u -rc0daad5cf902e4d8ee557ac2d09d477c19409bf7 -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/Common/src/Ringtoets.Common.IO/Resources/StochastSchema.xsd	(.../StochastSchema.xsd)	(revision c0daad5cf902e4d8ee557ac2d09d477c19409bf7)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Resources/StochastSchema.xsd	(.../StochastSchema.xsd)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -46,13 +46,10 @@
   een standaardafwijking of variatiecoefficient kan worden gegeven.-->
   <xs:element name="stochast">
     <xs:complexType>
-      <xs:sequence>
+      <xs:all>
         <xs:element minOccurs="0" ref="verwachtingswaarde"/>
-        <xs:choice minOccurs="0">
-          <xs:element ref="standaardafwijking"/>
-          <xs:element ref="variatiecoefficient"/>
-        </xs:choice>
-      </xs:sequence>
+        <xs:element minOccurs="0" ref="standaardafwijking-of-variatiecoefficient"/>
+      </xs:all>
       <xs:attribute name="naam" type="nameType" use="required"/>
     </xs:complexType>
   </xs:element>
@@ -72,18 +69,7 @@
     </xs:simpleType>
   </xs:element>
 
-  <!--Element definitie voor het opgeven van een standaardafwijking.-->
-  <xs:element name="standaardafwijking">
-    <xs:simpleType>
-      <xs:restriction base="xs:double"/>
-    </xs:simpleType>
-  </xs:element>
-
-  <!--Element definitie voor het opgeven van een variatiecoefficient.-->
-  <xs:element name="variatiecoefficient">
-    <xs:simpleType>
-      <xs:restriction base="xs:double"/>
-    </xs:simpleType>
-  </xs:element>
+  <!--Specificeert de keus van een standaardafwijking of een variatiecoefficient.-->
+  <xs:element name="standaardafwijking-of-variatiecoefficient" abstract="true" />
   
 </xs:schema>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Resources/StochastStandardDeviationSchema.xsd
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.IO/Resources/StochastStandardDeviationSchema.xsd	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Resources/StochastStandardDeviationSchema.xsd	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2016. All rights reserved.
+
+This file is part of Ringtoets.
+
+Ringtoets is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <!--Element definitie voor het opgeven van een standaardafwijking.-->
+  <xs:element name="standaardafwijking" substitutionGroup="standaardafwijking-of-variatiecoefficient">
+    <xs:simpleType>
+      <xs:restriction base="xs:double"/>
+    </xs:simpleType>
+  </xs:element>
+  
+</xs:schema>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Resources/StochastVariationCoefficientSchema.xsd
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.IO/Resources/StochastVariationCoefficientSchema.xsd	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Resources/StochastVariationCoefficientSchema.xsd	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2016. All rights reserved.
+
+This file is part of Ringtoets.
+
+Ringtoets is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <!--Element definitie voor het opgeven van een variatiecoefficient.-->
+  <xs:element name="variatiecoefficient" substitutionGroup="standaardafwijking-of-variatiecoefficient">
+    <xs:simpleType>
+      <xs:restriction base="xs:double"/>
+    </xs:simpleType>
+  </xs:element>
+  
+</xs:schema>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj
===================================================================
diff -u -rf3feb7d017a933271c410470add90ae106745ceb -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj	(.../Ringtoets.Common.IO.csproj)	(revision f3feb7d017a933271c410470add90ae106745ceb)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj	(.../Ringtoets.Common.IO.csproj)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -138,6 +138,12 @@
     <None Include="Resources\StochastSchema.xsd">
       <SubType>Designer</SubType>
     </None>
+    <None Include="Resources\StochastStandardDeviationSchema.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Resources\StochastVariationCoefficientSchema.xsd">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Resources\VoorlandProfielSchema.xsd">
       <SubType>Designer</SubType>
     </None>
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Readers/GrassCoverErosionInwardsCalculationConfigurationReader.cs
===================================================================
diff -u -rd0a54cbc1b0f33a350874859f97f713182a3d478 -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Readers/GrassCoverErosionInwardsCalculationConfigurationReader.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReader.cs)	(revision d0a54cbc1b0f33a350874859f97f713182a3d478)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Readers/GrassCoverErosionInwardsCalculationConfigurationReader.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReader.cs)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -38,6 +38,12 @@
     /// </summary>
     public class GrassCoverErosionInwardsCalculationConfigurationReader : CalculationConfigurationReader<ReadGrassCoverErosionInwardsCalculation>
     {
+        private const string hrLocatieSchemaName = "HrLocatieSchema.xsd";
+        private const string orientatieSchemaName = "OrientatieSchema.xsd";
+        private const string golfReductieSchemaName = "GolfReductieSchema.xsd";
+        private const string stochastSchemaName = "StochastSchema.xsd";
+        private const string stochastStandardDeviationSchemaName = "StochastStandardDeviationSchema.xsd";
+
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionInwardsCalculationConfigurationReader"/>.
         /// </summary>
@@ -57,16 +63,19 @@
                    new Dictionary<string, string>
                    {
                        {
-                           "HrLocatieSchema.xsd", RingtoetsCommonIOResources.HrLocatieSchema
+                           hrLocatieSchemaName, RingtoetsCommonIOResources.HrLocatieSchema
                        },
                        {
-                           "OrientatieSchema.xsd", RingtoetsCommonIOResources.OrientatieSchema
+                           orientatieSchemaName, RingtoetsCommonIOResources.OrientatieSchema
                        },
                        {
-                           "GolfReductieSchema.xsd", RingtoetsCommonIOResources.GolfReductieSchema
+                           golfReductieSchemaName, RingtoetsCommonIOResources.GolfReductieSchema
                        },
                        {
-                           "StochastSchema.xsd", RingtoetsCommonIOResources.StochastSchema
+                           stochastSchemaName, RingtoetsCommonIOResources.StochastSchema
+                       },
+                       {
+                           stochastStandardDeviationSchemaName, RingtoetsCommonIOResources.StochastStandardDeviationSchema
                        }
                    }) {}
 
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Resources/GEKBConfiguratieSchema.xsd
===================================================================
diff -u -r7a466d4ccb9d859b47f565b400808eb6933b18f0 -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Resources/GEKBConfiguratieSchema.xsd	(.../GEKBConfiguratieSchema.xsd)	(revision 7a466d4ccb9d859b47f565b400808eb6933b18f0)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Resources/GEKBConfiguratieSchema.xsd	(.../GEKBConfiguratieSchema.xsd)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -31,15 +31,15 @@
     <xs:complexType name="berekeningType">
       <xs:complexContent>
         <xs:extension base="berekeningType">
-          <xs:sequence>
+          <xs:all>
             <xs:element ref="hrlocatie" minOccurs="0"/>
             <xs:element ref="dijkprofiel" minOccurs="0"/>
             <xs:element ref="orientatie" minOccurs="0"/>
             <xs:element ref="dijkhoogte" minOccurs="0"/>
             <xs:element ref="hbnberekenen" minOccurs="0"/>
             <xs:element ref="golfreductie" minOccurs="0"/>
             <xs:element ref="stochasten" minOccurs="0"/>
-          </xs:sequence>
+          </xs:all>
         </xs:extension>
       </xs:complexContent>
     </xs:complexType>
@@ -64,6 +64,13 @@
     </xs:simpleType>
   </xs:redefine>
 
+
+  <!--Generieke definitie voor de standaardafwijking van een stochast..-->
+  <xs:include schemaLocation="StochastStandardDeviationSchema.xsd"/>
+
+  <!--Generieke definitie voor de variatiecoefficient van een stochast.-->
+  <xs:include schemaLocation="StochastVariationCoefficientSchema.xsd"/>
+
   <!--Volgende elementen zijn specifiek voor dit toetsspoor.-->
   
   <!--Specificeert het geselecteerde dijkprofiel. In dit element moet de naam van
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -rbdf7f0211b88d757eb716dfbdf1a09bc0c0ec860 -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs)	(revision bdf7f0211b88d757eb716dfbdf1a09bc0c0ec860)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -36,7 +36,7 @@
     public class GrassCoverErosionInwardsCalculationConfigurationReaderTest
     {
         private readonly string testDirectoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.GrassCoverErosionInwards.IO,
-                                                                               "GrassCoverErosionInwardsCalculationConfigurationReader");
+                                                                               nameof(GrassCoverErosionInwardsCalculationConfigurationReader));
 
         private static IEnumerable<TestCaseData> InvalidConfigurations
         {
@@ -46,14 +46,14 @@
                                               "The 'hrlocatie' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.")
                     .SetName("invalidHydraulicBoundaryLocationEmpty");
                 yield return new TestCaseData("invalidMultipleHydraulicBoundaryLocations.xml",
-                                              "The element 'berekening' has invalid child element 'hrlocatie'.")
+                                              "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidMultipleHydraulicBoundaryLocations");
 
                 yield return new TestCaseData("invalidDikeProfileEmpty.xml",
                                               "The 'dijkprofiel' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.")
                     .SetName("invalidDikeProfileEmpty");
                 yield return new TestCaseData("invalidMultipleDikeProfiles.xml",
-                                              "The element 'berekening' has invalid child element 'dijkprofiel'.")
+                                              "Element 'dijkprofiel' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidMultipleDikeProfiles");
 
                 yield return new TestCaseData("invalidOrientationEmpty.xml",
@@ -66,7 +66,7 @@
                                               "The 'orientatie' element is invalid - The value '1,2' is invalid according to its datatype 'Double'")
                     .SetName("invalidOrientationWrongCulture");
                 yield return new TestCaseData("invalidMultipleOrientation.xml",
-                                              "The element 'berekening' has invalid child element 'orientatie'.")
+                                              "Element 'orientatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidMultipleOrientation");
 
                 yield return new TestCaseData("invalidDikeHeightEmpty.xml",
@@ -79,14 +79,14 @@
                                               "The 'dijkhoogte' element is invalid - The value '1,2' is invalid according to its datatype 'Double'")
                     .SetName("invalidDikeHeightWrongCulture");
                 yield return new TestCaseData("invalidMultipleDikeHeight.xml",
-                                              "The element 'berekening' has invalid child element 'dijkhoogte'.")
+                                              "Element 'dijkhoogte' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidMultipleDikeHeight");
 
                 yield return new TestCaseData("invalidDikeHeightCalculationTypeEmpty.xml",
                                               "The 'hbnberekenen' element is invalid - The value '' is invalid according to its datatype 'String' - The Enumeration constraint failed.")
                     .SetName("invalidDikeHeightCalculationTypeEmpty");
                 yield return new TestCaseData("invalidMultipleDikeHeightCalculationTypes.xml",
-                                              "The element 'berekening' has invalid child element 'hbnberekenen'.")
+                                              "Element 'hbnberekenen' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidMultipleDikeHeightCalculationTypes");
                 yield return new TestCaseData("invalidDikeHeightCalculationTypeUnsupportedString.xml",
                                               "The 'hbnberekenen' element is invalid - The value 'invalid' is invalid according to its datatype 'String' - The Enumeration constraint failed.")
@@ -149,7 +149,7 @@
                                               "The 'verwachtingswaarde' element is invalid - The value '1,2' is invalid according to its datatype 'Double'")
                     .SetName("invalidCriticalFlowRateMeanWrongCulture");
                 yield return new TestCaseData("invalidMultipleCriticalFlowRateMean.xml",
-                                              "The element 'stochast' has invalid child element 'verwachtingswaarde'.")
+                                              "Element 'verwachtingswaarde' cannot appear more than once if content model type is \"all\"")
                     .SetName("invalidMultipleCriticalFlowRateMean");
 
                 yield return new TestCaseData("invalidCriticalFlowRateStandardDeviationEmpty.xml",
@@ -162,7 +162,7 @@
                                               "The 'standaardafwijking' element is invalid - The value '1,2' is invalid according to its datatype 'Double'")
                     .SetName("invalidCriticalFlowRateStandardDeviationWrongCulture");
                 yield return new TestCaseData("invalidMultipleCriticalFlowRateStandardDeviation.xml",
-                                              "The element 'stochast' has invalid child element 'standaardafwijking'.")
+                                              "Element 'standaardafwijking' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidMultipleCriticalFlowRateStandardDeviation");
 
                 yield return new TestCaseData("invalidStochastNoName.xml",
@@ -172,7 +172,7 @@
                                               "The 'naam' attribute is invalid - The value 'unsupported' is invalid according to its datatype 'nameType' - The Enumeration constraint failed.")
                     .SetName("invalidStochastUnknownName");
                 yield return new TestCaseData("invalidMultipleStochasts.xml",
-                                              "The element 'berekening' has invalid child element 'stochasten'.")
+                                              "Element 'stochasten' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidMultipleStochasts");
             }
         }
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/PipingCalculationConfigurationReader.cs
===================================================================
diff -u -ra5c5133ec23681679e77ff31b89e6410d366f247 -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/PipingCalculationConfigurationReader.cs	(.../PipingCalculationConfigurationReader.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/PipingCalculationConfigurationReader.cs	(.../PipingCalculationConfigurationReader.cs)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -38,7 +38,7 @@
     public class PipingCalculationConfigurationReader : CalculationConfigurationReader<ReadPipingCalculation>
     {
         private const string stochastSchemaName = "StochastSchema.xsd";
-        private const string hydraulicBoundaryLocationSchemaName = "HrLocatieSchema.xsd";
+        private const string stochastStandardDeviationSchemaName = "StochastStandardDeviationSchema.xsd";
 
         /// <summary>
         /// Creates a new instance of <see cref="PipingCalculationConfigurationReader"/>.
@@ -62,7 +62,7 @@
                            stochastSchemaName, RingtoetsCommonIOResources.StochastSchema
                        },
                        {
-                           hydraulicBoundaryLocationSchemaName, RingtoetsCommonIOResources.HrLocatieSchema
+                           stochastStandardDeviationSchemaName, RingtoetsCommonIOResources.StochastStandardDeviationSchema
                        }
                    }) {}
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Resources/PipingConfiguratieSchema.xsd
===================================================================
diff -u -r8a00046f9112833f25944b0f2631c7003f7a1692 -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Resources/PipingConfiguratieSchema.xsd	(.../PipingConfiguratieSchema.xsd)	(revision 8a00046f9112833f25944b0f2631c7003f7a1692)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Resources/PipingConfiguratieSchema.xsd	(.../PipingConfiguratieSchema.xsd)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -35,25 +35,22 @@
     <xs:complexType name="berekeningType">
       <xs:complexContent>
         <xs:extension base="berekeningType">
-          <xs:sequence>
-            <xs:choice minOccurs="0">
-              <xs:element ref="hrlocatie"/>
-              <xs:element ref="toetspeil"/>
-            </xs:choice>
+          <xs:all>
+            <xs:element ref="hrlocatie-of-toetspeil" minOccurs="0"/>
             <xs:element ref="profielschematisatie" minOccurs="0"/>
             <xs:element ref="intredepunt" minOccurs="0"/>
             <xs:element ref="uittredepunt" minOccurs="0"/>
             <xs:element ref="ondergrondmodel" minOccurs="0"/>
             <xs:element ref="ondergrondschematisatie" minOccurs="0"/>
             <xs:element ref="stochasten" minOccurs="0"/>
-          </xs:sequence>
+          </xs:all>
         </xs:extension>
       </xs:complexContent>
     </xs:complexType>
   </xs:redefine>
 
   <!--Generieke definitie van de geselecteerde HR locatie voor alle toetssporen.-->
-  <xs:include schemaLocation="HrLocatieSchema.xsd"></xs:include>
+  <xs:include schemaLocation="HrLocatieSchema.xsd"/>
 
   <!--Generieke definitie van stochasten voor alle toetssporen.-->
   <xs:redefine schemaLocation="StochastSchema.xsd">
@@ -64,16 +61,31 @@
       </xs:restriction>
     </xs:simpleType>
   </xs:redefine>
+  
+  <xs:include schemaLocation="StochastStandardDeviationSchema.xsd"/>
 
   <!--Elementen die specifiek voor dit toetsspoor nodig zijn.-->
   
+  <!--Specificeert de keus van een HR locatie of een toetspeil.-->
+  <xs:element name="hrlocatie-of-toetspeil" abstract="true" />
+  
   <!--Specificeert het handmatig ingevoerde toetspeil. Indien dit element is
   opgenomen, mag geen HR locatie element worden opgenomen (en andersom).-->
-  <xs:element name="toetspeil">
+  <xs:element name="toetspeil" substitutionGroup="hrlocatie-of-toetspeil" >
     <xs:simpleType>
       <xs:restriction base="xs:double"/>
     </xs:simpleType>
   </xs:element>
+  
+  <!--Specificeert de HR locatie. Indien dit element is opgenomen, mag geen 
+  handmatig ingevoerde toetspeil element worden opgenomen (en andersom).-->
+  <xs:element name="hrlocatie" substitutionGroup="hrlocatie-of-toetspeil">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="1"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
 
   <!--In dit element moet de naam van de geselecteerde profielschematisatie zoals
   ook zichtbaar in Ringtoets worden opgenomen.-->
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingCalculationConfigurationReaderTest.cs
===================================================================
diff -u -rbdf7f0211b88d757eb716dfbdf1a09bc0c0ec860 -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingCalculationConfigurationReaderTest.cs	(.../PipingCalculationConfigurationReaderTest.cs)	(revision bdf7f0211b88d757eb716dfbdf1a09bc0c0ec860)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingCalculationConfigurationReaderTest.cs	(.../PipingCalculationConfigurationReaderTest.cs)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -75,10 +75,10 @@
                                               "The 'naam' attribute is invalid - The value 'Test' is invalid according to its datatype 'nameType' - The Enumeration constraint failed.")
                     .SetName("invalidStochastUnknownName");
                 yield return new TestCaseData("invalidStochastMultipleMean.xml",
-                                              "The element 'stochast' has invalid child element 'verwachtingswaarde'.")
+                                              "Element 'verwachtingswaarde' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidStochastMultipleMean");
                 yield return new TestCaseData("invalidStochastMultipleStandardDeviation.xml",
-                                              "The element 'stochast' has invalid child element 'standaardafwijking'.")
+                                              "Element 'standaardafwijking' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidStochastMultipleStandardDeviation");
                 yield return new TestCaseData("invalidStochastMeanEmpty.xml",
                                               "The 'verwachtingswaarde' element is invalid - The value '' is invalid according to its datatype 'Double'")
@@ -105,31 +105,31 @@
                                               "There is a duplicate key sequence 'dempingsfactor' for the 'uniqueStochastNameConstraint' key or unique identity constraint.")
                     .SetName("invalidMultipleDampingFactorExitStochast");
                 yield return new TestCaseData("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocation.xml",
-                                              "The element 'berekening' has invalid child element 'hrlocatie'.")
+                                              "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocation");
                 yield return new TestCaseData("invalidCalculationMultipleAssessmentLevel.xml",
-                                              "The element 'berekening' has invalid child element 'toetspeil'.")
+                                              "Element 'toetspeil' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleAssessmentLevel");
                 yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocation.xml",
-                                              "The element 'berekening' has invalid child element 'hrlocatie'.")
+                                              "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleHydraulicBoundaryLocation");
                 yield return new TestCaseData("invalidCalculationMultipleSurfaceLine.xml",
-                                              "The element 'berekening' has invalid child element 'profielschematisatie'.")
+                                              "Element 'profielschematisatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleSurfaceLine");
                 yield return new TestCaseData("invalidCalculationMultipleEntryPoint.xml",
-                                              "The element 'berekening' has invalid child element 'intredepunt'.")
+                                              "Element 'intredepunt' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleEntryPoint");
                 yield return new TestCaseData("invalidCalculationMultipleExitPoint.xml",
-                                              "The element 'berekening' has invalid child element 'uittredepunt'.")
+                                              "Element 'uittredepunt' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleExitPoint");
                 yield return new TestCaseData("invalidCalculationMultipleStochasticSoilModel.xml",
-                                              "The element 'berekening' has invalid child element 'ondergrondmodel'.")
+                                              "Element 'ondergrondmodel' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleStochasticSoilModel");
                 yield return new TestCaseData("invalidCalculationMultipleStochasticSoilProfile.xml",
-                                              "The element 'berekening' has invalid child element 'ondergrondschematisatie'.")
+                                              "Element 'ondergrondschematisatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleStochasticSoilProfile");
                 yield return new TestCaseData("invalidCalculationMultipleStochasts.xml",
-                                              "The element 'berekening' has invalid child element 'stochasten'.")
+                                              "Element 'stochasten' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleStochasts");
                 yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml",
                                               "The 'hrlocatie' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.")
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel.xml
===================================================================
diff -u -r7594d7f46113b5c5f4f41bfbd0183a3789f648b9 -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel.xml	(.../validConfigurationFullCalculationContainingAssessmentLevel.xml)	(revision 7594d7f46113b5c5f4f41bfbd0183a3789f648b9)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel.xml	(.../validConfigurationFullCalculationContainingAssessmentLevel.xml)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -3,8 +3,8 @@
   <berekening naam="Calculation">
     <toetspeil>1.1</toetspeil>
     <profielschematisatie>Profielschematisatie</profielschematisatie>
-    <intredepunt>2.2</intredepunt>
     <uittredepunt>3.3</uittredepunt>
+    <intredepunt>2.2</intredepunt>
     <ondergrondmodel>Ondergrondmodel</ondergrondmodel>
     <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
     <stochasten>
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenHrConfiguratieSchema.xsd
===================================================================
diff -u -rb84f4b9c37b5ce0bd49b65269c4984c0bc1543e8 -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenHrConfiguratieSchema.xsd	(.../BekledingenHrConfiguratieSchema.xsd)	(revision b84f4b9c37b5ce0bd49b65269c4984c0bc1543e8)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenHrConfiguratieSchema.xsd	(.../BekledingenHrConfiguratieSchema.xsd)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -29,7 +29,7 @@
     <xs:complexType name="berekeningType">
       <xs:complexContent>
         <xs:extension base="berekeningType">
-          <xs:sequence>
+          <xs:all>
             <xs:element ref="hrlocatie" minOccurs="0"/>
             <xs:element ref="bovengrensbekleding" minOccurs="0"/>
             <xs:element ref="ondergrensbekleding" minOccurs="0"/>
@@ -39,7 +39,7 @@
             <xs:element ref="voorlandprofiel" minOccurs="0"/>
             <xs:element ref="orientatie" minOccurs="0"/>
             <xs:element ref="golfreductie" minOccurs="0"/>
-          </xs:sequence>
+          </xs:all>
         </xs:extension>
       </xs:complexContent>
     </xs:complexType>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -rd0a54cbc1b0f33a350874859f97f713182a3d478 -r5d7d6070e020dcc02fefb624d582c958d9bd9890
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsCalculationConfigurationReaderTest.cs	(.../WaveConditionsCalculationConfigurationReaderTest.cs)	(revision d0a54cbc1b0f33a350874859f97f713182a3d478)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsCalculationConfigurationReaderTest.cs	(.../WaveConditionsCalculationConfigurationReaderTest.cs)	(revision 5d7d6070e020dcc02fefb624d582c958d9bd9890)
@@ -36,38 +36,38 @@
     public class WaveConditionsCalculationConfigurationReaderTest
     {
         private readonly string testDirectoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Revetment.IO,
-                                                                               "WaveConditionsCalculationConfigurationReader");
+                                                                               nameof(WaveConditionsCalculationConfigurationReader));
 
         private static IEnumerable<TestCaseData> InvalidConfigurations
         {
             get
             {
                 yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocation.xml",
-                                              "The element 'berekening' has invalid child element 'hrlocatie'.")
+                                              "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleHydraulicBoundaryLocation");
                 yield return new TestCaseData("invalidCalculationMultipleForeshoreProfile.xml",
-                                              "The element 'berekening' has invalid child element 'voorlandprofiel'.")
+                                              "Element 'voorlandprofiel' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleForeshoreProfile");
                 yield return new TestCaseData("invalidCalculationMultipleOrientation.xml",
-                                              "The element 'berekening' has invalid child element 'orientatie'.")
+                                              "Element 'orientatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleOrientation");
                 yield return new TestCaseData("invalidCalculationMultipleLowerBoundaryRevetment.xml",
-                                              "The element 'berekening' has invalid child element 'ondergrensbekleding'.")
+                                              "Element 'ondergrensbekleding' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleLowerBoundaryRevetment");
                 yield return new TestCaseData("invalidCalculationMultipleUpperBoundaryRevetment.xml",
-                                              "The element 'berekening' has invalid child element 'bovengrensbekleding'.")
+                                              "Element 'bovengrensbekleding' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleUpperBoundaryRevetment");
                 yield return new TestCaseData("invalidCalculationMultipleLowerBoundaryWaterLevels.xml",
-                                              "The element 'berekening' has invalid child element 'ondergrenswaterstanden'.")
+                                              "Element 'ondergrenswaterstanden' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleLowerBoundaryWaterLevels");
                 yield return new TestCaseData("invalidCalculationMultipleUpperBoundaryWaterLevels.xml",
-                                              "The element 'berekening' has invalid child element 'bovengrenswaterstanden'.")
+                                              "Element 'bovengrenswaterstanden' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleUpperBoundaryWaterLevels");
                 yield return new TestCaseData("invalidCalculationMultipleStepSize.xml",
-                                              "The element 'berekening' has invalid child element 'stapgrootte'.")
+                                              "Element 'stapgrootte' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleStepSize");
                 yield return new TestCaseData("invalidCalculationMultipleWaveReduction.xml",
-                                              "The element 'berekening' has invalid child element 'golfreductie'.")
+                                              "Element 'golfreductie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleWaveReduction");
                 yield return new TestCaseData("invalidCalculationMultipleDamUsage.xml",
                                               "The element 'golfreductie' has invalid child element 'damgebruiken'.")