Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r84523cbdf7a083f411e6b67174cea1c792d6b270 -r0e62bf068191a3b74bb52834455624d49d083911
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs	(.../ClosingStructuresCalculationConfigurationReader.cs)	(revision 84523cbdf7a083f411e6b67174cea1c792d6b270)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs	(.../ClosingStructuresCalculationConfigurationReader.cs)	(revision 0e62bf068191a3b74bb52834455624d49d083911)
@@ -62,7 +62,7 @@
         /// </list>
         /// </exception>
         public ClosingStructuresCalculationConfigurationReader(string filePath)
-            : base(filePath,
+            : base(filePath, new CalculationConfigurationSchemaDefinitions(
                    Resources.KunstwerkenBetrouwbaarheidSluitenSchema,
                    new Dictionary<string, string>
                    {
@@ -93,7 +93,7 @@
                        {
                            scenarioSchemaName, RiskeerCommonIOResources.ScenarioSchema
                        }
-                   }) {}
+                   })) {}
 
         protected override ClosingStructuresCalculationConfiguration ParseCalculationElement(XElement calculationElement)
         {
Index: Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r0e62bf068191a3b74bb52834455624d49d083911
--- Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs	(.../CalculationConfigurationImporterTest.cs)	(revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs	(.../CalculationConfigurationImporterTest.cs)	(revision 0e62bf068191a3b74bb52834455624d49d083911)
@@ -845,7 +845,7 @@
                                               "validConfigurationSchema.xsd"));
 
             public CalculationConfigurationReader(string xmlFilePath)
-                : base(xmlFilePath, mainSchemaDefinition, new Dictionary<string, string>()) {}
+                : base(xmlFilePath, new CalculationConfigurationSchemaDefinitions(mainSchemaDefinition, new Dictionary<string, string>())) {}
 
             protected override ReadCalculation ParseCalculationElement(XElement calculationElement)
             {
Index: Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationReaderTest.cs
===================================================================
diff -u -rb70c5fe23fc35933af143bba669d3e2239377307 -r0e62bf068191a3b74bb52834455624d49d083911
--- Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationReaderTest.cs	(.../CalculationConfigurationReaderTest.cs)	(revision b70c5fe23fc35933af143bba669d3e2239377307)
+++ Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationReaderTest.cs	(.../CalculationConfigurationReaderTest.cs)	(revision 0e62bf068191a3b74bb52834455624d49d083911)
@@ -348,7 +348,7 @@
             public CalculationConfigurationReader(string xmlFilePath,
                                                   string mainSchemaDefinition,
                                                   IDictionary<string, string> nestedSchemaDefinitions)
-                : base(xmlFilePath, mainSchemaDefinition, nestedSchemaDefinitions) {}
+                : base(xmlFilePath, new CalculationConfigurationSchemaDefinitions(mainSchemaDefinition, nestedSchemaDefinitions)) {}
 
             protected override ReadCalculation ParseCalculationElement(XElement calculationElement)
             {
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs
===================================================================
diff -u -rb07ac6b1e90cab46e4f856c76a40a5fc25e7df11 -r0e62bf068191a3b74bb52834455624d49d083911
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReader.cs)	(revision b07ac6b1e90cab46e4f856c76a40a5fc25e7df11)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReader.cs)	(revision 0e62bf068191a3b74bb52834455624d49d083911)
@@ -61,28 +61,30 @@
         /// </exception>
         public GrassCoverErosionInwardsCalculationConfigurationReader(string xmlFilePath)
             : base(xmlFilePath,
-                   Resources.GEKBConfiguratieSchema,
-                   new Dictionary<string, string>
-                   {
+                   new CalculationConfigurationSchemaDefinitions(
+                       Resources.GEKBConfiguratieSchema,
+                       new Dictionary<string, string>
                        {
-                           hbLocatieSchemaName, RiskeerCommonIOResources.HbLocatieSchema
-                       },
-                       {
-                           orientatieSchemaName, RiskeerCommonIOResources.OrientatieSchema
-                       },
-                       {
-                           golfReductieSchemaName, RiskeerCommonIOResources.GolfReductieSchema
-                       },
-                       {
-                           stochastSchemaName, RiskeerCommonIOResources.StochastSchema
-                       },
-                       {
-                           stochastStandaardafwijkingSchemaName, RiskeerCommonIOResources.StochastStandaardafwijkingSchema
-                       },
-                       {
-                           scenarioSchemaName, RiskeerCommonIOResources.ScenarioSchema
-                       }
-                   }) {}
+                           {
+                               hbLocatieSchemaName, RiskeerCommonIOResources.HbLocatieSchema
+                           },
+                           {
+                               orientatieSchemaName, RiskeerCommonIOResources.OrientatieSchema
+                           },
+                           {
+                               golfReductieSchemaName, RiskeerCommonIOResources.GolfReductieSchema
+                           },
+                           {
+                               stochastSchemaName, RiskeerCommonIOResources.StochastSchema
+                           },
+                           {
+                               stochastStandaardafwijkingSchemaName, RiskeerCommonIOResources.StochastStandaardafwijkingSchema
+                           },
+                           {
+                               scenarioSchemaName, RiskeerCommonIOResources.ScenarioSchema
+                           }
+                       }))
+        {}
 
         protected override GrassCoverErosionInwardsCalculationConfiguration ParseCalculationElement(XElement calculationElement)
         {
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r1a3a54d9378da14718c66fd31b3a0f2f5e7b560b -r0e62bf068191a3b74bb52834455624d49d083911
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs	(.../HeightStructuresCalculationConfigurationReader.cs)	(revision 1a3a54d9378da14718c66fd31b3a0f2f5e7b560b)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs	(.../HeightStructuresCalculationConfigurationReader.cs)	(revision 0e62bf068191a3b74bb52834455624d49d083911)
@@ -61,7 +61,7 @@
         /// </list>
         /// </exception>
         public HeightStructuresCalculationConfigurationReader(string filePath)
-            : base(filePath,
+            : base(filePath,new CalculationConfigurationSchemaDefinitions(
                    Resources.KunstwerkenHoogteSchema,
                    new Dictionary<string, string>
                    {
@@ -92,7 +92,7 @@
                        {
                            scenarioSchemaName, RiskeerCommonIOResources.ScenarioSchema
                        }
-                   }) {}
+                   })) {}
 
         protected override HeightStructuresCalculationConfiguration ParseCalculationElement(XElement calculationElement)
         {
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0e62bf068191a3b74bb52834455624d49d083911
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs	(.../MacroStabilityInwardsCalculationConfigurationReader.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs	(.../MacroStabilityInwardsCalculationConfigurationReader.cs)	(revision 0e62bf068191a3b74bb52834455624d49d083911)
@@ -59,7 +59,7 @@
         /// </list>
         /// </exception>
         internal MacroStabilityInwardsCalculationConfigurationReader(string xmlFilePath)
-            : base(xmlFilePath,
+            : base(xmlFilePath, new CalculationConfigurationSchemaDefinitions(
                    Resources.MacroStabiliteitBinnenwaartsConfiguratieSchema,
                    new Dictionary<string, string>
                    {
@@ -75,7 +75,7 @@
                        {
                            slopeStabilityGridsSchemaName, Resources.MacroStabiliteitBinnenwaartsGridsSchema
                        }
-                   }) {}
+                   })) {}
 
         protected override MacroStabilityInwardsCalculationConfiguration ParseCalculationElement(XElement calculationElement)
         {
Index: Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0e62bf068191a3b74bb52834455624d49d083911
--- Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs	(.../PipingCalculationConfigurationReader.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs	(.../PipingCalculationConfigurationReader.cs)	(revision 0e62bf068191a3b74bb52834455624d49d083911)
@@ -56,7 +56,7 @@
         /// </list>
         /// </exception>
         internal PipingCalculationConfigurationReader(string xmlFilePath)
-            : base(xmlFilePath,
+            : base(xmlFilePath, new CalculationConfigurationSchemaDefinitions(
                    Resources.PipingConfiguratieSchema,
                    new Dictionary<string, string>
                    {
@@ -69,7 +69,7 @@
                        {
                            scenarioSchemaName, RiskeerCommonIOResources.ScenarioSchema
                        }
-                   }) {}
+                   })) {}
 
         protected override PipingCalculationConfiguration ParseCalculationElement(XElement calculationElement)
         {
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0e62bf068191a3b74bb52834455624d49d083911
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 0e62bf068191a3b74bb52834455624d49d083911)
@@ -62,7 +62,8 @@
         /// </list>
         /// </exception>
         protected WaveConditionsCalculationConfigurationReader(string xmlFilePath, string mainSchemaDefinition)
-            : base(xmlFilePath, mainSchemaDefinition,
+            : base(xmlFilePath,new CalculationConfigurationSchemaDefinitions(
+                       mainSchemaDefinition,
                    new Dictionary<string, string>
                    {
                        {
@@ -80,7 +81,7 @@
                        {
                            waveReductionSchemaName, RiskeerCommonIOResources.GolfReductieSchema
                        }
-                   }) {}
+                   })) {}
 
         protected abstract override T ParseCalculationElement(XElement calculationElement);
 
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -rff0edf44f1a80c349d4873d4e70d903d2a560ceb -r0e62bf068191a3b74bb52834455624d49d083911
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs	(.../StabilityPointStructuresCalculationConfigurationReader.cs)	(revision ff0edf44f1a80c349d4873d4e70d903d2a560ceb)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs	(.../StabilityPointStructuresCalculationConfigurationReader.cs)	(revision 0e62bf068191a3b74bb52834455624d49d083911)
@@ -62,7 +62,7 @@
         /// </list>
         /// </exception>
         public StabilityPointStructuresCalculationConfigurationReader(string filePath)
-            : base(filePath,
+            : base(filePath, new CalculationConfigurationSchemaDefinitions(
                    Resources.StabilityPointStructuresConfigurationSchema,
                    new Dictionary<string, string>
                    {
@@ -93,8 +93,7 @@
                        {
                            scenarioSchemaName, RiskeerCommonIOResources.ScenarioSchema
                        }
-                   }
-            ) {}
+                   })) {}
 
         protected override StabilityPointStructuresCalculationConfiguration ParseCalculationElement(XElement calculationElement)
         {