Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
===================================================================
diff -u -r33b1979ea5681dcaef595262bbe14e5c274fdfc2 -r4d6b107a57f8108b102fb711569d1d33a3023389
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql	(.../DatabaseStructure18.1.sql)	(revision 33b1979ea5681dcaef595262bbe14e5c274fdfc2)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql	(.../DatabaseStructure18.1.sql)	(revision 4d6b107a57f8108b102fb711569d1d33a3023389)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 12.0 		*/
-/*  Created On : 23-Jan-2018 15:49:03 				*/
+/*  Created On : 24-jan-2018 10:25:03 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -492,6 +492,7 @@
 	'StabilityStoneCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 	'FailureMechanismEntityId' INTEGER NOT NULL,
 	'ForeshoreProfileCollectionSourcePath' TEXT,
+	'N' REAL NOT NULL,
 	CONSTRAINT 'FK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -r4d6b107a57f8108b102fb711569d1d33a3023389
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 7d89262d3b971dceec1e987e22d0027bf675c196)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 4d6b107a57f8108b102fb711569d1d33a3023389)
@@ -44,6 +44,7 @@
     <Compile Include="Create\GrassCoverErosionInwards\OvertoppingRateOutputCreateExtensions.cs" />
     <Compile Include="Create\GrassCoverErosionOutwards\GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs" />
     <Compile Include="Create\HeightStructures\HeightStructureCreateExtensions.cs" />
+    <Compile Include="Create\HydraulicBoundaryLocationCalculationCreateExtensions.cs" />
     <Compile Include="Create\HydraulicBoundaryLocationOutputCreateExtensions.cs" />
     <Compile Include="Create\IllustrationPoints\IllustrationPointNodeCreateExtensions.cs" />
     <Compile Include="Create\IllustrationPoints\GeneralResultCreateExtensions.cs" />
@@ -191,6 +192,9 @@
     <Compile Include="DbContext\HydraRingPreprocessorEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
+    <Compile Include="DbContext\HydraulicLocationCalculationEntity.cs">
+      <DependentUpon>RingtoetsEntities.tt</DependentUpon>
+    </Compile>
     <Compile Include="DbContext\HydraulicLocationEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
@@ -200,7 +204,6 @@
     <Compile Include="DbContext\HydraulicLocationOutputType.cs" />
     <Compile Include="DbContext\IGeneralResultEntity.cs" />
     <Compile Include="DbContext\IHasGeneralResultFaultTreeIllustrationPointEntity.cs" />
-    <Compile Include="DbContext\IHydraulicLocationOutputEntity.cs" />
     <Compile Include="DbContext\IllustrationPointResultEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
@@ -253,10 +256,8 @@
     <Compile Include="DbContext\PartialClosingStructuresCalculationEntity.cs" />
     <Compile Include="DbContext\PartialGeneralResultFaultTreeIllustrationPointEntity.cs" />
     <Compile Include="DbContext\PartialGeneralResultSubMechanismIllustrationPointEntity.cs" />
-    <Compile Include="DbContext\PartialGrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs" />
     <Compile Include="DbContext\PartialHeightStructuresCalculationEntity.cs" />
     <Compile Include="DbContext\PartialHeightStructuresOutputEntity.cs" />
-    <Compile Include="DbContext\PartialHydraulicLocationOutputEntity.cs" />
     <Compile Include="DbContext\PartialStabilityPointStructuresCalculationEntity.cs" />
     <Compile Include="DbContext\PartialStabilityPointStructuresOutputEntity.cs" />
     <Compile Include="DbContext\PipingCalculationEntity.cs">
@@ -366,6 +367,7 @@
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
     <Compile Include="Exceptions\CannotDetermineFingerprintException.cs" />
+    <Compile Include="Create\GrassCoverErosionOutwards\GrassCoverErosionOutwardsHydraulicLocationOutputEntityReadExtensions.cs" />
     <Compile Include="Read\BackgroundDataMetaEntityReadExtensions.cs" />
     <Compile Include="Read\ClosingStructures\ClosingStructureEntityReadExtensions.cs" />
     <Compile Include="Read\ClosingStructures\ClosingStructuresCalculationEntityReadExtensions.cs" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -r4d6b107a57f8108b102fb711569d1d33a3023389
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 7d89262d3b971dceec1e987e22d0027bf675c196)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 4d6b107a57f8108b102fb711569d1d33a3023389)
@@ -82,6 +82,7 @@
     <Compile Include="Create\WaveImpactAsphaltCover\WaveImpactAsphaltCoverWaveConditionsOutputCreateExtensionsTest.cs" />
     <Compile Include="DbContext\RingtoetsEntitiesTest.cs" />
     <Compile Include="Exceptions\CannotDetermineFingerprintExceptionTest.cs" />
+    <Compile Include="Create\HydraulicBoundaryLocationCalculationCreateExtensionsTest.cs" />
     <Compile Include="IntegrationTests\MigrationIntegrationTest.cs" />
     <Compile Include="IntegrationTests\MigrationTo181IntegrationTest.cs" />
     <Compile Include="IntegrationTests\MigrationTo173IntegrationTest.cs" />
@@ -100,6 +101,7 @@
     <Compile Include="Read\GrassCoverErosionInwards\GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs" />
     <Compile Include="Read\GrassCoverErosionInwards\GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensionsTest.cs" />
     <Compile Include="Read\GrassCoverErosionOutwards\GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs" />
+    <Compile Include="Read\GrassCoverErosionOutwards\GrassCoverErosionOutwardsHydraulicLocationOutputEntityReadExtensionsTest.cs" />
     <Compile Include="Read\GrassCoverErosionOutwards\GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs" />
     <Compile Include="Read\GrassCoverErosionOutwards\GrassCoverErosionOutwardsWaveConditionsOutputEntityReadExtensionsTest.cs" />
     <Compile Include="Read\HeightStructures\HeightStructuresCalculationEntityReadExtensionsTest.cs" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -r4d6b107a57f8108b102fb711569d1d33a3023389
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 7d89262d3b971dceec1e987e22d0027bf675c196)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 4d6b107a57f8108b102fb711569d1d33a3023389)
@@ -26,6 +26,7 @@
 using Application.Ringtoets.Storage.Read;
 using Application.Ringtoets.Storage.Serializers;
 using Application.Ringtoets.Storage.TestUtil;
+using Application.Ringtoets.Storage.TestUtil.Hydraulics;
 using Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
@@ -200,18 +201,17 @@
             const string testVersion = "testVersion";
             entity.HydraulicDatabaseLocation = testLocation;
             entity.HydraulicDatabaseVersion = testVersion;
-            entity.HydraulicLocationEntities.Add(new HydraulicLocationEntity
-            {
-                Name = "A",
-                Order = 1
-            });
-            entity.HydraulicLocationEntities.Add(new HydraulicLocationEntity
-            {
-                Name = "B",
-                Order = 0
-            });
             entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
+            HydraulicLocationEntity hydraulicLocationEntityOne = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
+            hydraulicLocationEntityOne.Name = "A";
+            hydraulicLocationEntityOne.Order = 1;
+            entity.HydraulicLocationEntities.Add(hydraulicLocationEntityOne);
+            HydraulicLocationEntity hydraulicLocationEntityTwo = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
+            hydraulicLocationEntityOne.Name = "B";
+            hydraulicLocationEntityOne.Order = 0;
+            entity.HydraulicLocationEntities.Add(hydraulicLocationEntityTwo);
+
             var collector = new ReadConversionCollector();
 
             // Call
@@ -243,23 +243,22 @@
             const string preprocessorDirectory = "preprocessorLocation";
             entity.HydraulicDatabaseLocation = testLocation;
             entity.HydraulicDatabaseVersion = testVersion;
-            entity.HydraulicLocationEntities.Add(new HydraulicLocationEntity
-            {
-                Name = "A",
-                Order = 1
-            });
-            entity.HydraulicLocationEntities.Add(new HydraulicLocationEntity
-            {
-                Name = "B",
-                Order = 0
-            });
             entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
             entity.HydraRingPreprocessorEntities.Add(new HydraRingPreprocessorEntity
             {
                 UsePreprocessor = usePreprocessor,
                 PreprocessorDirectory = preprocessorDirectory
             });
 
+            HydraulicLocationEntity hydraulicLocationEntityOne = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
+            hydraulicLocationEntityOne.Name = "A";
+            hydraulicLocationEntityOne.Order = 1;
+            entity.HydraulicLocationEntities.Add(hydraulicLocationEntityOne);
+            HydraulicLocationEntity hydraulicLocationEntityTwo = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
+            hydraulicLocationEntityOne.Name = "B";
+            hydraulicLocationEntityOne.Order = 0;
+            entity.HydraulicLocationEntities.Add(hydraulicLocationEntityTwo);
+
             var collector = new ReadConversionCollector();
 
             // Call
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51 -r4d6b107a57f8108b102fb711569d1d33a3023389
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 4d6b107a57f8108b102fb711569d1d33a3023389)
@@ -346,9 +346,19 @@
                                                                  double.NaN, double.NaN,
                                                                  double.NaN, CalculationConvergence.CalculatedConverged, null)
                 },
+                DesignWaterLevelCalculation3 =
+                {
+                    Output = new HydraulicBoundaryLocationOutput(12.4, double.NaN,
+                                                                 double.NaN, double.NaN,
+                                                                 double.NaN, CalculationConvergence.CalculatedConverged, null)
+                },
                 WaveHeightCalculation1 =
                 {
                     Output = new HydraulicBoundaryLocationOutput(2.4, 0, 0, 0, 0, CalculationConvergence.CalculatedNotConverged, null)
+                },
+                WaveHeightCalculation3 =
+                {
+                    Output = new HydraulicBoundaryLocationOutput(2.4, 0, 0, 0, 0, CalculationConvergence.CalculatedNotConverged, null)
                 }
             };
 
@@ -368,13 +378,29 @@
                     },
                     Output = designWaterLevelOutput
                 },
+                DesignWaterLevelCalculation3 =
+                {
+                    InputParameters =
+                    {
+                        ShouldIllustrationPointsBeCalculated = true
+                    },
+                    Output = designWaterLevelOutput
+                },
                 WaveHeightCalculation1 =
                 {
                     InputParameters =
                     {
                         ShouldIllustrationPointsBeCalculated = true
                     },
                     Output = waveHeightOutput
+                },
+                WaveHeightCalculation3 =
+                {
+                    InputParameters =
+                    {
+                        ShouldIllustrationPointsBeCalculated = true
+                    },
+                    Output = waveHeightOutput
                 }
             };
         }
Index: build/DatabaseStructure.sql
===================================================================
diff -u -r33b1979ea5681dcaef595262bbe14e5c274fdfc2 -r4d6b107a57f8108b102fb711569d1d33a3023389
--- build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 33b1979ea5681dcaef595262bbe14e5c274fdfc2)
+++ build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 4d6b107a57f8108b102fb711569d1d33a3023389)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 12.0 		*/
-/*  Created On : 23-Jan-2018 15:49:03 				*/
+/*  Created On : 24-jan-2018 10:25:03 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -492,6 +492,7 @@
 	'StabilityStoneCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 	'FailureMechanismEntityId' INTEGER NOT NULL,
 	'ForeshoreProfileCollectionSourcePath' TEXT,
+	'N' REAL NOT NULL,
 	CONSTRAINT 'FK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;