Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r1dee1f59e8d9958f8a05d37d3f3331225540aee1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs)	(revision 1dee1f59e8d9958f8a05d37d3f3331225540aee1)
@@ -64,12 +64,14 @@
             return entity;
         }
 
-        private static void SetInputParameters(GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity, GrassCoverErosionOutwardsWaveConditionsCalculation calculation, PersistenceRegistry registry)
+        private static void SetInputParameters(GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity, 
+                                               GrassCoverErosionOutwardsWaveConditionsCalculation calculation,
+                                               PersistenceRegistry registry)
         {
             HydraulicBoundaryLocation hydraulicBoundaryLocation = calculation.InputParameters.HydraulicBoundaryLocation;
             if (hydraulicBoundaryLocation != null)
             {
-                entity.GrassCoverErosionOutwardsHydraulicLocationEntity = hydraulicBoundaryLocation.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, 0);
+                entity.HydraulicLocationEntity = registry.Get(hydraulicBoundaryLocation);
             }
             if (calculation.InputParameters.ForeshoreProfile != null)
             {
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs
===================================================================
diff -u -rf05b4b6bbe032a1c358f2a4ffe4f5ff6726d8000 -r1dee1f59e8d9958f8a05d37d3f3331225540aee1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs)	(revision f05b4b6bbe032a1c358f2a4ffe4f5ff6726d8000)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs)	(revision 1dee1f59e8d9958f8a05d37d3f3331225540aee1)
@@ -70,7 +70,7 @@
         private static void ReadCalculationInputs(WaveConditionsInput inputParameters, GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity, ReadConversionCollector collector)
         {
             inputParameters.ForeshoreProfile = GetDikeProfileValue(entity.ForeshoreProfileEntity, collector);
-            inputParameters.HydraulicBoundaryLocation = GetHydraulicBoundaryLocationValue(entity.GrassCoverErosionOutwardsHydraulicLocationEntity, collector);
+            inputParameters.HydraulicBoundaryLocation = GetHydraulicBoundaryLocationValue(entity.HydraulicLocationEntity, collector);
             inputParameters.Orientation = (RoundedDouble) entity.Orientation.ToNullAsNaN();
             inputParameters.UseForeshore = Convert.ToBoolean(entity.UseForeshore);
             inputParameters.UseBreakWater = Convert.ToBoolean(entity.UseBreakWater);
@@ -103,10 +103,12 @@
         }
 
         private static HydraulicBoundaryLocation GetHydraulicBoundaryLocationValue(
-            GrassCoverErosionOutwardsHydraulicLocationEntity hydraulicLocationEntity,
+            HydraulicLocationEntity hydraulicLocationEntity,
             ReadConversionCollector collector)
         {
-            return hydraulicLocationEntity?.Read(collector);
+            return hydraulicLocationEntity != null 
+                       ? collector.Get(hydraulicLocationEntity) 
+                       : null;
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs
===================================================================
diff -u -r38414ee18cb869ba91e6b70abc4019a39ea2e08c -r1dee1f59e8d9958f8a05d37d3f3331225540aee1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs)	(revision 38414ee18cb869ba91e6b70abc4019a39ea2e08c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs)	(revision 1dee1f59e8d9958f8a05d37d3f3331225540aee1)
@@ -24,6 +24,7 @@
 using Application.Ringtoets.Storage.Create;
 using Application.Ringtoets.Storage.Create.GrassCoverErosionOutwards;
 using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.TestUtil.Hydraulics;
 using Core.Common.Base.Data;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
@@ -128,7 +129,7 @@
             Assert.IsNull(entity.CalculationGroupEntity);
             Assert.AreEqual(0, entity.GrassCoverErosionOutwardsWaveConditionsOutputEntities.Count);
             Assert.IsNull(entity.ForeshoreProfileEntity);
-            Assert.IsNull(entity.GrassCoverErosionOutwardsHydraulicLocationEntity);
+            Assert.IsNull(entity.HydraulicLocationEntity);
         }
 
         [Test]
@@ -166,11 +167,7 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 2.3, 4.5);
-
-            var registry = new PersistenceRegistry();
-            GrassCoverErosionOutwardsHydraulicLocationEntity hydraulicLocationEntity =
-                hydraulicBoundaryLocation.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, 0);
-
+            
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 InputParameters =
@@ -179,11 +176,15 @@
                 }
             };
 
+            HydraulicLocationEntity hydraulicLocationEntity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
+            var registry = new PersistenceRegistry();
+            registry.Register(hydraulicLocationEntity, hydraulicBoundaryLocation);
+
             // Call
             GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity = calculation.Create(registry, 0);
 
             // Assert
-            Assert.AreSame(hydraulicLocationEntity, entity.GrassCoverErosionOutwardsHydraulicLocationEntity);
+            Assert.AreSame(hydraulicLocationEntity, entity.HydraulicLocationEntity);
         }
 
         [Test]
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r8ff26e0d7885f432a6e470e8d68ce325bdc6a9bc -r1dee1f59e8d9958f8a05d37d3f3331225540aee1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision 8ff26e0d7885f432a6e470e8d68ce325bdc6a9bc)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision 1dee1f59e8d9958f8a05d37d3f3331225540aee1)
@@ -26,6 +26,7 @@
 using Application.Ringtoets.Storage.Read;
 using Application.Ringtoets.Storage.Read.GrassCoverErosionOutwards;
 using Application.Ringtoets.Storage.Serializers;
+using Application.Ringtoets.Storage.TestUtil.Hydraulics;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
@@ -212,11 +213,11 @@
         public void Read_EntityWithHydraulicBoundaryLocationInCollector_CalculationHasAlreadyReadHydraulicBoundaryLocation()
         {
             // Setup
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 1.1, 2.2);
-            var hydraulicLocationEntity = new GrassCoverErosionOutwardsHydraulicLocationEntity();
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            HydraulicLocationEntity hydraulicLocationEntity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
             var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity
             {
-                GrassCoverErosionOutwardsHydraulicLocationEntity = hydraulicLocationEntity
+                HydraulicLocationEntity = hydraulicLocationEntity
             };
 
             var collector = new ReadConversionCollector();
@@ -230,29 +231,6 @@
         }
 
         [Test]
-        public void Read_EntityWithHydraulicBoundaryLocationNotYetInCollector_CalculationWithCreatedHydraulicBoundaryLocationAndRegisteredNewEntities()
-        {
-            // Setup
-            var hydraulicLocationEntity = new GrassCoverErosionOutwardsHydraulicLocationEntity
-            {
-                Name = "A"
-            };
-
-            var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity
-            {
-                GrassCoverErosionOutwardsHydraulicLocationEntity = hydraulicLocationEntity
-            };
-
-            var collector = new ReadConversionCollector();
-
-            // Call
-            entity.Read(collector);
-
-            // Assert
-            Assert.IsTrue(collector.Contains(hydraulicLocationEntity));
-        }
-
-        [Test]
         public void Read_EntityWithCalculationOutputEntity_CalculationWithOutput()
         {
             // Setup