Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs
===================================================================
diff -u -r2539713cb27674daed011f260add32abcaddb958 -rf04205ffb20784bfa07e35b80f7c4d194a298dba
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs	(.../PipingCalculationConfigurationReader.cs)	(revision 2539713cb27674daed011f260add32abcaddb958)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs	(.../PipingCalculationConfigurationReader.cs)	(revision f04205ffb20784bfa07e35b80f7c4d194a298dba)
@@ -75,7 +75,7 @@
         {
             return new PipingCalculationConfiguration(calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value)
             {
-                AssessmentLevel = calculationElement.GetDoubleValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement),
+                AssessmentLevel = GetWaterLevel(calculationElement),
                 HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementOld),
                 SurfaceLineName = calculationElement.GetStringValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.SurfaceLineElement),
                 EntryPointL = calculationElement.GetDoubleValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.EntryPointLElement),
@@ -87,5 +87,11 @@
                 Scenario = calculationElement.GetScenarioConfiguration()
             };
         }
+
+        private static double? GetWaterLevel(XElement calculationElement)
+        {
+            return calculationElement.GetDoubleValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.WaterLevelElement) 
+                   ?? calculationElement.GetDoubleValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f -rf04205ffb20784bfa07e35b80f7c4d194a298dba
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs	(.../PipingCalculationConfigurationReaderTest.cs)	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs	(.../PipingCalculationConfigurationReaderTest.cs)	(revision f04205ffb20784bfa07e35b80f7c4d194a298dba)
@@ -256,10 +256,12 @@
         }
 
         [Test]
-        public void Read_ValidConfigurationWithCalculationContainingNaNs_ReturnExpectedReadPipingCalculation()
+        [TestCase("validConfigurationCalculationContainingAssessmentLevelAndNaNs")]
+        [TestCase("validConfigurationCalculationContainingWaterLevelAndNaNs")]
+        public void Read_ValidConfigurationWithCalculationContainingNaNs_ReturnExpectedReadPipingCalculation(string fileName)
         {
             // Setup
-            string filePath = Path.Combine(testDirectoryPath, "validConfigurationCalculationContainingNaNs.xml");
+            string filePath = Path.Combine(testDirectoryPath, $"{fileName}.xml");
             var reader = new PipingCalculationConfigurationReader(filePath);
 
             // Call
@@ -279,10 +281,12 @@
         }
 
         [Test]
-        public void Read_ValidConfigurationWithCalculationContainingInfinities_ReturnExpectedReadPipingCalculation()
+        [TestCase("validConfigurationCalculationContainingAssessmentLevelAndInfinities")]
+        [TestCase("validConfigurationCalculationContainingWaterLevelAndInfinities")]
+        public void Read_ValidConfigurationWithCalculationContainingInfinities_ReturnExpectedReadPipingCalculation(string fileName)
         {
             // Setup
-            string filePath = Path.Combine(testDirectoryPath, "validConfigurationCalculationContainingInfinities.xml");
+            string filePath = Path.Combine(testDirectoryPath, $"{fileName}.xml");
             var reader = new PipingCalculationConfigurationReader(filePath);
 
             // Call
@@ -344,14 +348,14 @@
         }
 
         [Test]
-        [TestCase("validConfigurationFullCalculationContainingAssessmentLevel.xml",
-            TestName = "Read_ValidConfigurationWithFullCalculationContainingAssessmentLevel_ReturnPipingCalculation(AssessmentLevel)")]
-        [TestCase("validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml",
-            TestName = "Read_ValidConfigurationWithFullCalculationContainingAssessmentLevel_ReturnPipingCalculation(AssessmentLevel_differentOrder)")]
+        [TestCase("validConfigurationFullCalculationContainingAssessmentLevel")]
+        [TestCase("validConfigurationFullCalculationContainingWaterLevel")]
+        [TestCase("validConfigurationFullCalculationContainingAssessmentLevel_differentOrder")]
+        [TestCase("validConfigurationFullCalculationContainingWaterLevel_differentOrder")]
         public void Read_ValidConfigurationWithFullCalculationContainingAssessmentLevel_ReturnExpectedReadPipingCalculation(string fileName)
         {
             // Setup
-            string filePath = Path.Combine(testDirectoryPath, fileName);
+            string filePath = Path.Combine(testDirectoryPath, $"{fileName}.xml");
             var reader = new PipingCalculationConfigurationReader(filePath);
 
             // Call
@@ -390,7 +394,7 @@
             var calculation = (PipingCalculationConfiguration) readConfigurationItems.Single();
 
             Assert.AreEqual("Calculation", calculation.Name);
-            Assert.AreEqual(1.1, calculation.AssessmentLevel);
+            Assert.IsNull(calculation.AssessmentLevel);
             Assert.IsNull(calculation.HydraulicBoundaryLocationName);
             Assert.IsNull(calculation.SurfaceLineName);
             Assert.IsNull(calculation.EntryPointL);
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndInfinities.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndInfinities.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndInfinities.xml	(revision f04205ffb20784bfa07e35b80f7c4d194a298dba)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <toetspeil>-INF</toetspeil>
+    <intredepunt>-INF</intredepunt>
+    <uittredepunt>INF</uittredepunt>
+    <stochasten>
+      <stochast naam="polderpeil">
+        <verwachtingswaarde>-INF</verwachtingswaarde>
+        <standaardafwijking>INF</standaardafwijking>
+      </stochast>
+      <stochast naam="dempingsfactor">
+        <verwachtingswaarde>INF</verwachtingswaarde>
+        <standaardafwijking>INF</standaardafwijking>
+      </stochast>
+    </stochasten>
+    <scenario>
+      <bijdrage>-INF</bijdrage>
+    </scenario>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndNaNs.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndNaNs.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndNaNs.xml	(revision f04205ffb20784bfa07e35b80f7c4d194a298dba)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <toetspeil>NaN</toetspeil>
+    <intredepunt>NaN</intredepunt>
+    <uittredepunt>NaN</uittredepunt>
+    <stochasten>
+      <stochast naam="polderpeil">
+        <verwachtingswaarde>NaN</verwachtingswaarde>
+        <standaardafwijking>NaN</standaardafwijking>
+      </stochast>
+      <stochast naam="dempingsfactor">
+        <verwachtingswaarde>NaN</verwachtingswaarde>
+        <standaardafwijking>NaN</standaardafwijking>
+      </stochast>
+    </stochasten>
+    <scenario>
+      <bijdrage>NaN</bijdrage>
+    </scenario>
+  </berekening>
+</configuratie>
\ No newline at end of file
Fisheye: Tag f04205ffb20784bfa07e35b80f7c4d194a298dba refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingInfinities.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f04205ffb20784bfa07e35b80f7c4d194a298dba refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingNaNs.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndInfinities.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndInfinities.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndInfinities.xml	(revision f04205ffb20784bfa07e35b80f7c4d194a298dba)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>-INF</waterstand>
+    <intredepunt>-INF</intredepunt>
+    <uittredepunt>INF</uittredepunt>
+    <stochasten>
+      <stochast naam="polderpeil">
+        <verwachtingswaarde>-INF</verwachtingswaarde>
+        <standaardafwijking>INF</standaardafwijking>
+      </stochast>
+      <stochast naam="dempingsfactor">
+        <verwachtingswaarde>INF</verwachtingswaarde>
+        <standaardafwijking>INF</standaardafwijking>
+      </stochast>
+    </stochasten>
+    <scenario>
+      <bijdrage>-INF</bijdrage>
+    </scenario>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndNaNs.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndNaNs.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndNaNs.xml	(revision f04205ffb20784bfa07e35b80f7c4d194a298dba)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>NaN</waterstand>
+    <intredepunt>NaN</intredepunt>
+    <uittredepunt>NaN</uittredepunt>
+    <stochasten>
+      <stochast naam="polderpeil">
+        <verwachtingswaarde>NaN</verwachtingswaarde>
+        <standaardafwijking>NaN</standaardafwijking>
+      </stochast>
+      <stochast naam="dempingsfactor">
+        <verwachtingswaarde>NaN</verwachtingswaarde>
+        <standaardafwijking>NaN</standaardafwijking>
+      </stochast>
+    </stochasten>
+    <scenario>
+      <bijdrage>NaN</bijdrage>
+    </scenario>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel.xml	(revision f04205ffb20784bfa07e35b80f7c4d194a298dba)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>1.1</waterstand>
+    <profielschematisatie>Profielschematisatie</profielschematisatie>
+    <uittredepunt>3.3</uittredepunt>
+    <intredepunt>2.2</intredepunt>
+    <ondergrondmodel>Ondergrondmodel</ondergrondmodel>
+    <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
+    <stochasten>
+      <stochast naam="polderpeil">
+        <verwachtingswaarde>4.4</verwachtingswaarde>
+        <standaardafwijking>5.5</standaardafwijking>
+      </stochast>
+      <stochast naam="dempingsfactor">
+        <verwachtingswaarde>6.6</verwachtingswaarde>
+        <standaardafwijking>7.7</standaardafwijking>
+      </stochast>
+    </stochasten>
+    <scenario>
+      <gebruik>false</gebruik>
+      <bijdrage>8.8</bijdrage>
+    </scenario>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel_differentOrder.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel_differentOrder.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel_differentOrder.xml	(revision f04205ffb20784bfa07e35b80f7c4d194a298dba)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <stochasten>
+      <stochast naam="dempingsfactor">
+        <standaardafwijking>7.7</standaardafwijking>
+        <verwachtingswaarde>6.6</verwachtingswaarde>
+      </stochast>
+      <stochast naam="polderpeil">
+        <standaardafwijking>5.5</standaardafwijking>
+        <verwachtingswaarde>4.4</verwachtingswaarde>
+      </stochast>
+    </stochasten>
+    <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
+    <ondergrondmodel>Ondergrondmodel</ondergrondmodel>
+    <intredepunt>2.2</intredepunt>
+    <scenario>
+      <bijdrage>8.8</bijdrage>
+      <gebruik>false</gebruik>
+    </scenario>
+    <uittredepunt>3.3</uittredepunt>
+    <profielschematisatie>Profielschematisatie</profielschematisatie>
+    <waterstand>1.1</waterstand>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationPartialCalculation.xml
===================================================================
diff -u -r7594d7f46113b5c5f4f41bfbd0183a3789f648b9 -rf04205ffb20784bfa07e35b80f7c4d194a298dba
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationPartialCalculation.xml	(.../validConfigurationPartialCalculation.xml)	(revision 7594d7f46113b5c5f4f41bfbd0183a3789f648b9)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationPartialCalculation.xml	(.../validConfigurationPartialCalculation.xml)	(revision f04205ffb20784bfa07e35b80f7c4d194a298dba)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuratie>
   <berekening naam="Calculation">
-    <toetspeil>1.1</toetspeil>
     <uittredepunt>2.2</uittredepunt>
     <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
     <stochasten>