Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r3c6627960ecb62ff59882a80802196b0ad061a14 -re9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs	(.../ClosingStructuresCalculationConfigurationReader.cs)	(revision 3c6627960ecb62ff59882a80802196b0ad061a14)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs	(.../ClosingStructuresCalculationConfigurationReader.cs)	(revision e9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025)
@@ -65,7 +65,7 @@
             : base(filePath, new[]
             {
                 new CalculationConfigurationSchemaDefinition(
-                    0, Resources.KunstwerkenBetrouwbaarheidSluitenSchema,
+                    0, Resources.KunstwerkenBetrouwbaarheidSluitenSchema_0,
                     new Dictionary<string, string>
                     {
                         {
@@ -90,7 +90,7 @@
                             stochastVariatiecoefficientSchemaName, RiskeerCommonIOResources.StochastVariatiecoefficientSchema
                         },
                         {
-                            structureBaseSchemaName, RiskeerCommonIOResources.KunstwerkenBasisSchema
+                            structureBaseSchemaName, RiskeerCommonIOResources.KunstwerkenBasisSchema_0
                         },
                         {
                             scenarioSchemaName, RiskeerCommonIOResources.ScenarioSchema
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f -re9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025)
@@ -40,7 +40,7 @@
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -82,6 +82,27 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to &lt;!--
+        ///Copyright (C) Stichting Deltares 2019. All rights reserved.
+        ///
+        ///This file is part of Riskeer.
+        ///
+        ///Riskeer 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 PARTICU [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string KunstwerkenBetrouwbaarheidSluitenConfiguratieSchema0To1 {
+            get {
+                return ResourceManager.GetString("KunstwerkenBetrouwbaarheidSluitenConfiguratieSchema0To1", 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 2019. All rights reserved.
         ///
@@ -93,12 +114,34 @@
         ///(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 [rest of string was truncated]&quot;;.
+        ///but WITHOUT ANY WARRANTY; without even the implied warranty of
+        ///ME [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string KunstwerkenBetrouwbaarheidSluitenSchema {
             get {
                 return ResourceManager.GetString("KunstwerkenBetrouwbaarheidSluitenSchema", 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 2019. All rights reserved.
+        ///
+        ///This file is part of Riskeer.
+        ///
+        ///Riskeer 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
+        ///ME [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string KunstwerkenBetrouwbaarheidSluitenSchema_0 {
+            get {
+                return ResourceManager.GetString("KunstwerkenBetrouwbaarheidSluitenSchema_0", resourceCulture);
+            }
+        }
     }
 }
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Properties/Resources.resx
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -re9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Properties/Resources.resx	(.../Resources.resx)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Properties/Resources.resx	(.../Resources.resx)	(revision e9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025)
@@ -118,7 +118,13 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="KunstwerkenBetrouwbaarheidSluitenConfiguratieSchema0To1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\kunstwerkenbetrouwbaarheidsluitenconfiguratieschema0to1.xslt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
   <data name="KunstwerkenBetrouwbaarheidSluitenSchema" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\KunstwerkenBetrouwbaarheidSluitenSchema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="KunstwerkenBetrouwbaarheidSluitenSchema_0" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\kunstwerkenbetrouwbaarheidsluitenschema_0.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: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenConfiguratieSchema0To1.xslt
===================================================================
diff -u
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenConfiguratieSchema0To1.xslt	(revision 0)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenConfiguratieSchema0To1.xslt	(revision e9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025)
@@ -0,0 +1,36 @@
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of Riskeer.
+
+Riskeer 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.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" version="1.0" indent="yes" omit-xml-declaration="yes"/>
+  <xsl:template match="node()|@*">
+      <xsl:copy>
+          <xsl:apply-templates select="node()|@*"/>
+      </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="berekening/hrlocatie">
+    <xsl:element name="hblocatie">
+      <xsl:apply-templates/>
+    </xsl:element>
+  </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenSchema.xsd
===================================================================
diff -u -r84523cbdf7a083f411e6b67174cea1c792d6b270 -re9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenSchema.xsd	(.../KunstwerkenBetrouwbaarheidSluitenSchema.xsd)	(revision 84523cbdf7a083f411e6b67174cea1c792d6b270)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenSchema.xsd	(.../KunstwerkenBetrouwbaarheidSluitenSchema.xsd)	(revision e9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025)
@@ -36,7 +36,7 @@
       <xs:complexContent>
         <xs:extension base="berekeningType">
           <xs:all>
-            <xs:element ref="hblocatie-of-hrlocatie" minOccurs="0"/>
+            <xs:element ref="hblocatie" minOccurs="0"/>
             <xs:element ref="factorstormduur" minOccurs="0"/>
             <xs:element ref="kunstwerk" minOccurs="0"/>
             <xs:element ref="orientatie" minOccurs="0"/>
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenSchema_0.xsd
===================================================================
diff -u
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenSchema_0.xsd	(revision 0)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenSchema_0.xsd	(revision e9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of Riskeer.
+
+Riskeer 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">
+
+  <!--Algemene structuur met configuratie, mappen en berekeningen.-->
+  
+  <!--Basis elementen voor een kunstwerken configuratie.-->
+  <xs:include schemaLocation="KunstwerkenBasisSchema.xsd" />
+
+  <!--Definitie voor het specificeren van een berekeningsscenario-->
+  <xs:include schemaLocation="ScenariosSchema.xsd" />
+  
+  <!--Herdefinieer berekening, zodat deze de juiste inhoud heeft.-->
+  <xs:redefine schemaLocation="ConfiguratieSchema.xsd">
+    <xs:complexType name="berekeningType">
+      <xs:complexContent>
+        <xs:extension base="berekeningType">
+          <xs:all>
+            <xs:element ref="hblocatie-of-hrlocatie" minOccurs="0"/>
+            <xs:element ref="factorstormduur" minOccurs="0"/>
+            <xs:element ref="kunstwerk" minOccurs="0"/>
+            <xs:element ref="orientatie" minOccurs="0"/>
+            <xs:element ref="instroommodel" minOccurs="0"/>
+            <xs:element ref="nrdoorstroomopeningen" minOccurs="0"/>
+            <xs:element ref="kansopopenstaan" minOccurs="0"/>
+            <xs:element ref="kansmislukkensluiting" minOccurs="0"/>
+            <xs:element ref="faalkansherstel" minOccurs="0"/>
+            <xs:element ref="faalkansgegevenerosiebodem" minOccurs="0"/>
+            <xs:element ref="voorlandprofiel" minOccurs="0"/>
+            <xs:element ref="golfreductie" minOccurs="0"/>
+            <xs:element ref="stochasten" minOccurs="0"/>
+            <xs:element ref="illustratiepunteninlezen" minOccurs="0"/>
+            <xs:element ref="scenario" minOccurs="0"/>
+          </xs:all>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:redefine>
+
+  <!--Herdefinieer stochastnamen. Voor dit toetsspoor zijn alleen de onderstaande
+  namen voor stochasten toegestaan (en ze mogen ook maar maximaal 1 keer voorkomen).-->
+  <xs:redefine schemaLocation="StochastSchema.xsd">
+    <xs:simpleType name="nameType">
+      <xs:restriction base="nameType">
+        <xs:enumeration value="stormduur"/>
+        <xs:enumeration value="binnenwaterstand"/>
+        <xs:enumeration value="modelfactoroverloopdebiet"/>
+        <xs:enumeration value="afvoercoefficient"/>
+        <xs:enumeration value="breedtedoorstroomopening"/>
+        <xs:enumeration value="doorstroomoppervlak"/>
+        <xs:enumeration value="breedtebodembescherming"/>
+        <xs:enumeration value="kombergendoppervlak"/>
+        <xs:enumeration value="peilverhogingkomberging"/>
+        <xs:enumeration value="kruinhoogte"/>
+        <xs:enumeration value="drempelhoogte"/>
+        <xs:enumeration value="kritiekinstromenddebiet"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:redefine>
+
+  <!--Elementen die specifiek voor dit toetsspoor nodig zijn.-->
+  
+  <!--Specificeert de factor voor stormduur hoogwater gegeven een geopend kunstwerk.-->
+  <xs:element name="factorstormduur">
+    <xs:simpleType>
+      <xs:restriction base="xs:double"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <!--Specificeert het gebruikte instroommodel.-->
+  <xs:element name="instroommodel">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:enumeration value="verticalewand"/>
+        <xs:enumeration value="lagedrempel"/>
+        <xs:enumeration value="verdronkenkoker"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <!--Specificeert het aantal identieke doorstroomopeningen.-->
+  <xs:element name="nrdoorstroomopeningen">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <!--Specificeert de kans op open staan bij naderend hoogwater.-->
+  <xs:element name="kansopopenstaan">
+    <xs:simpleType>
+      <xs:restriction base="xs:double"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <!--Specificeert de kans op mislukken van sluiting van het geopende kunstwerk.-->
+  <xs:element name="kansmislukkensluiting">
+    <xs:simpleType>
+      <xs:restriction base="xs:double"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <!--Specificeert de faalkans van herstel van de gefaalde situatie.-->
+  <xs:element name="faalkansherstel">
+    <xs:simpleType>
+      <xs:restriction base="xs:double"/>
+    </xs:simpleType>
+  </xs:element>
+
+</xs:schema>
\ No newline at end of file
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r3c6627960ecb62ff59882a80802196b0ad061a14 -re9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs	(.../HeightStructuresCalculationConfigurationReader.cs)	(revision 3c6627960ecb62ff59882a80802196b0ad061a14)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs	(.../HeightStructuresCalculationConfigurationReader.cs)	(revision e9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025)
@@ -89,7 +89,7 @@
                             stochastVariatiecoefficientSchemaName, RiskeerCommonIOResources.StochastVariatiecoefficientSchema
                         },
                         {
-                            structureBaseSchemaName, RiskeerCommonIOResources.KunstwerkenBasisSchema
+                            structureBaseSchemaName, RiskeerCommonIOResources.KunstwerkenBasisSchema_0
                         },
                         {
                             scenarioSchemaName, RiskeerCommonIOResources.ScenarioSchema
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r3c6627960ecb62ff59882a80802196b0ad061a14 -re9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs	(.../StabilityPointStructuresCalculationConfigurationReader.cs)	(revision 3c6627960ecb62ff59882a80802196b0ad061a14)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs	(.../StabilityPointStructuresCalculationConfigurationReader.cs)	(revision e9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025)
@@ -90,7 +90,7 @@
                             stochastVariatiecoefficientSchemaName, RiskeerCommonIOResources.StochastVariatiecoefficientSchema
                         },
                         {
-                            structureBaseSchemaName, RiskeerCommonIOResources.KunstwerkenBasisSchema
+                            structureBaseSchemaName, RiskeerCommonIOResources.KunstwerkenBasisSchema_0
                         },
                         {
                             scenarioSchemaName, RiskeerCommonIOResources.ScenarioSchema