Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs
===================================================================
diff -u -r214d55f4da294b59d6b3bd61100b27f2ad049853 -rb76d82d8f3c49387767a8e1f82cd24a6a94a1e7b
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReader.cs)	(revision 214d55f4da294b59d6b3bd61100b27f2ad049853)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReader.cs)	(revision b76d82d8f3c49387767a8e1f82cd24a6a94a1e7b)
@@ -26,7 +26,6 @@
 using Riskeer.Common.IO.Configurations;
 using Riskeer.Common.IO.Configurations.Helpers;
 using Riskeer.Common.IO.Configurations.Import;
-using Riskeer.GrassCoverErosionInwards.IO.Configurations.Helpers;
 using Riskeer.GrassCoverErosionInwards.IO.Properties;
 using RiskeerCommonIOResources = Riskeer.Common.IO.Properties.Resources;
 
@@ -143,14 +142,14 @@
                 DikeProfileId = calculationElement.GetStringValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeProfileElement),
                 Orientation = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.Orientation),
                 DikeHeight = calculationElement.GetDoubleValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightElement),
-                DikeHeightCalculationType = (ConfigurationHydraulicLoadsCalculationType?) calculationElement.GetConvertedValueFromDescendantStringElement<ConfigurationHydraulicLoadsCalculationTypeConverter>(
-                    GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightBeCalculatedElement),
-                OvertoppingRateCalculationType = (ConfigurationHydraulicLoadsCalculationType?) calculationElement.GetConvertedValueFromDescendantStringElement<ConfigurationHydraulicLoadsCalculationTypeConverter>(
-                    GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingRateBeCalculatedElement),
                 WaveReduction = calculationElement.GetWaveReductionParameters(),
                 CriticalFlowRate = calculationElement.GetStochastConfiguration(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.CriticalFlowRateStochastName),
                 ShouldOvertoppingOutputIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingOutputIllustrationPointsBeCalculatedElement),
+                ShouldDikeHeightBeCalculated = calculationElement.GetBoolValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightBeCalculatedElement),
+                DikeHeightTargetProbability = calculationElement.GetDoubleValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightTargetProbability),
                 ShouldDikeHeightIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightIllustrationPointsBeCalculatedElement),
+                ShouldOvertoppingRateBeCalculated = calculationElement.GetBoolValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingRateBeCalculatedElement),
+                OvertoppingRateTargetProbability = calculationElement.GetDoubleValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.OvertoppingRateTargetProbability),
                 ShouldOvertoppingRateIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingRateIllustrationPointsBeCalculatedElement),
                 Scenario = calculationElement.GetScenarioConfiguration()
             };
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Resources/GEKBConfiguratieSchema.xsd
===================================================================
diff -u -rd080cf564a9c4c3d13406171c26aab664b75eac2 -rb76d82d8f3c49387767a8e1f82cd24a6a94a1e7b
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Resources/GEKBConfiguratieSchema.xsd	(.../GEKBConfiguratieSchema.xsd)	(revision d080cf564a9c4c3d13406171c26aab664b75eac2)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Resources/GEKBConfiguratieSchema.xsd	(.../GEKBConfiguratieSchema.xsd)	(revision b76d82d8f3c49387767a8e1f82cd24a6a94a1e7b)
@@ -33,7 +33,7 @@
     <xs:complexType name="configuratieType">
       <xs:complexContent>
         <xs:extension base="configuratieType">
-          <xs:attribute name="versie" type="xs:int" use="required" fixed="1"/>
+          <xs:attribute name="versie" type="xs:int" use="required" fixed="2"/>
         </xs:extension>
       </xs:complexContent>
     </xs:complexType>
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -rb76d82d8f3c49387767a8e1f82cd24a6a94a1e7b
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs)	(revision a4e3b2745a48598260107bb5bfca7485205cdcc2)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs)	(revision b76d82d8f3c49387767a8e1f82cd24a6a94a1e7b)
@@ -362,10 +362,12 @@
         }
 
         [Test]
-        public void Read_ValidPreviousVersionConfigurationWithFullCalculation_ReturnExpectedReadCalculation()
+        [TestCase("version0ValidConfigurationFullCalculation")]
+        [TestCase("version1ValidConfigurationFullCalculation")]
+        public void Read_ValidPreviousVersionConfigurationWithFullCalculation_ReturnExpectedReadCalculation(string fileName)
         {
             // Setup
-            string filePath = Path.Combine(testDirectoryPath, "version0ValidConfigurationFullCalculation.xml");
+            string filePath = Path.Combine(testDirectoryPath, $"{fileName}.xml");
             var reader = new GrassCoverErosionInwardsCalculationConfigurationReader(filePath);
 
             // Call
@@ -487,16 +489,16 @@
             Assert.AreEqual("some_dike_profile", configuration.DikeProfileId);
             Assert.AreEqual(67.1, configuration.Orientation);
             Assert.AreEqual(3.45, configuration.DikeHeight);
-            Assert.AreEqual(ConfigurationHydraulicLoadsCalculationType.CalculateByAssessmentSectionNorm, configuration.DikeHeightCalculationType);
-            Assert.AreEqual(ConfigurationHydraulicLoadsCalculationType.CalculateByProfileSpecificRequiredProbability, configuration.OvertoppingRateCalculationType);
             Assert.AreEqual(true, configuration.WaveReduction.UseBreakWater);
             Assert.AreEqual(ConfigurationBreakWaterType.Dam, configuration.WaveReduction.BreakWaterType);
             Assert.AreEqual(1.234, configuration.WaveReduction.BreakWaterHeight);
             Assert.AreEqual(false, configuration.WaveReduction.UseForeshoreProfile);
             Assert.AreEqual(0.1, configuration.CriticalFlowRate.Mean);
             Assert.AreEqual(0.2, configuration.CriticalFlowRate.StandardDeviation);
             Assert.IsTrue(configuration.ShouldOvertoppingOutputIllustrationPointsBeCalculated);
+            Assert.IsTrue(configuration.ShouldDikeHeightBeCalculated);
             Assert.IsTrue(configuration.ShouldDikeHeightIllustrationPointsBeCalculated);
+            Assert.IsFalse(configuration.ShouldOvertoppingRateBeCalculated);
             Assert.IsFalse(configuration.ShouldOvertoppingRateIllustrationPointsBeCalculated);
             Assert.AreEqual(8.8, configuration.Scenario.Contribution);
             Assert.IsTrue(configuration.Scenario.IsRelevant);
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation.xml
===================================================================
diff -u -r4eda0672b3b13dacccdece0b28b8bd97403fd586 -rb76d82d8f3c49387767a8e1f82cd24a6a94a1e7b
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation.xml	(.../validConfigurationFullCalculation.xml)	(revision 4eda0672b3b13dacccdece0b28b8bd97403fd586)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation.xml	(.../validConfigurationFullCalculation.xml)	(revision b76d82d8f3c49387767a8e1f82cd24a6a94a1e7b)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie versie="1">
+<configuratie versie="2">
   <berekening naam="Berekening 1">
     <hblocatie>Some_hydraulic_boundary_location</hblocatie>
     <dijkprofiel>some_dike_profile</dijkprofiel>
@@ -8,8 +8,8 @@
 	<illustratiepunteninlezen>true</illustratiepunteninlezen>
     <hbnillustratiepunteninlezen>true</hbnillustratiepunteninlezen>
     <overslagdebietillustratiepunteninlezen>false</overslagdebietillustratiepunteninlezen>
-    <hbnberekenen>norm</hbnberekenen>
-    <overslagdebietberekenen>doorsnede</overslagdebietberekenen>
+    <hbnberekenen>true</hbnberekenen>
+    <overslagdebietberekenen>false</overslagdebietberekenen>
     <golfreductie>
       <damgebruiken>true</damgebruiken>
       <damtype>havendam</damtype>
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml
===================================================================
diff -u -r4eda0672b3b13dacccdece0b28b8bd97403fd586 -rb76d82d8f3c49387767a8e1f82cd24a6a94a1e7b
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml	(.../validConfigurationFullCalculation_differentOrder.xml)	(revision 4eda0672b3b13dacccdece0b28b8bd97403fd586)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml	(.../validConfigurationFullCalculation_differentOrder.xml)	(revision b76d82d8f3c49387767a8e1f82cd24a6a94a1e7b)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie versie="1">
+<configuratie versie="2">
   <berekening naam="Berekening 1">
-    <overslagdebietberekenen>doorsnede</overslagdebietberekenen>
+    <overslagdebietberekenen>false</overslagdebietberekenen>
     <stochasten>
       <stochast naam="overslagdebiet">
         <standaardafwijking>0.2</standaardafwijking>
@@ -21,7 +21,7 @@
       <damtype>havendam</damtype>
       <damgebruiken>true</damgebruiken>
     </golfreductie>
-    <hbnberekenen>norm</hbnberekenen>
+    <hbnberekenen>true</hbnberekenen>
     <dijkhoogte>3.45</dijkhoogte>
     <orientatie>67.1</orientatie>
     <dijkprofiel>some_dike_profile</dijkprofiel>
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml
===================================================================
diff -u -r4eda0672b3b13dacccdece0b28b8bd97403fd586 -rb76d82d8f3c49387767a8e1f82cd24a6a94a1e7b
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml	(.../version0ValidConfigurationFullCalculation.xml)	(revision 4eda0672b3b13dacccdece0b28b8bd97403fd586)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml	(.../version0ValidConfigurationFullCalculation.xml)	(revision b76d82d8f3c49387767a8e1f82cd24a6a94a1e7b)
@@ -9,7 +9,7 @@
     <hbnillustratiepunteninlezen>true</hbnillustratiepunteninlezen>
     <overslagdebietillustratiepunteninlezen>false</overslagdebietillustratiepunteninlezen>
     <hbnberekenen>norm</hbnberekenen>
-    <overslagdebietberekenen>doorsnede</overslagdebietberekenen>
+    <overslagdebietberekenen>niet</overslagdebietberekenen>
     <golfreductie>
       <damgebruiken>true</damgebruiken>
       <damtype>havendam</damtype>
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/version1ValidConfigurationFullCalculation.xml
===================================================================
diff -u
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/version1ValidConfigurationFullCalculation.xml	(revision 0)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/version1ValidConfigurationFullCalculation.xml	(revision b76d82d8f3c49387767a8e1f82cd24a6a94a1e7b)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie versie="1">
+  <berekening naam="Berekening 1">
+    <hblocatie>Some_hydraulic_boundary_location</hblocatie>
+    <dijkprofiel>some_dike_profile</dijkprofiel>
+    <orientatie>67.1</orientatie>
+    <dijkhoogte>3.45</dijkhoogte>
+    <illustratiepunteninlezen>true</illustratiepunteninlezen>
+    <hbnillustratiepunteninlezen>true</hbnillustratiepunteninlezen>
+    <overslagdebietillustratiepunteninlezen>false</overslagdebietillustratiepunteninlezen>
+    <hbnberekenen>norm</hbnberekenen>
+    <overslagdebietberekenen>niet</overslagdebietberekenen>
+    <golfreductie>
+      <damgebruiken>true</damgebruiken>
+      <damtype>havendam</damtype>
+      <damhoogte>1.234</damhoogte>
+      <voorlandgebruiken>false</voorlandgebruiken>
+    </golfreductie>
+    <stochasten>
+      <stochast naam="overslagdebiet">
+        <verwachtingswaarde>0.1</verwachtingswaarde>
+        <standaardafwijking>0.2</standaardafwijking>
+      </stochast>
+    </stochasten>
+      <scenario>
+        <gebruik>true</gebruik>
+        <bijdrage>8.8</bijdrage>
+      </scenario>
+  </berekening>
+</configuratie>
\ No newline at end of file