Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/HydraulicLocationConverter.cs
===================================================================
diff -u -rd242e89e13ef602facae6a1ef91660242bcef340 -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/HydraulicLocationConverter.cs	(.../HydraulicLocationConverter.cs)	(revision d242e89e13ef602facae6a1ef91660242bcef340)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/HydraulicLocationConverter.cs	(.../HydraulicLocationConverter.cs)	(revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c)
@@ -20,8 +20,8 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Application.Ringtoets.Storage.DbContext;
-using Core.Common.Base.Geometry;
 using Ringtoets.HydraRing.Data;
 
 namespace Application.Ringtoets.Storage.Converters
@@ -30,29 +30,43 @@
     ///  Converter for <see cref="HydraulicLocationEntity"/> to <see cref="HydraulicBoundaryLocation"/>
     /// and <see cref="HydraulicBoundaryLocation"/> to <see cref="HydraulicLocationEntity"/>.
     /// </summary>
-    public class HydraulicLocationConverter : IEntityConverter<HydraulicBoundaryLocation, HydraulicLocationEntity>
+    public class HydraulicLocationConverter // : IEntityConverter<HydraulicBoundaryLocation, HydraulicLocationEntity>
     {
-        public HydraulicBoundaryLocation ConvertEntityToModel(HydraulicLocationEntity entity)
+        /// <summary>
+        /// Converts <paramref name="entities"/> to an <see cref="ICollection{T}"/> of <see cref="HydraulicBoundaryLocation"/>.
+        /// </summary>
+        /// <param name="entities">The <see cref="ICollection{T}"/> of <see cref="HydraulicLocationEntity"/> to convert.</param>
+        /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="HydraulicBoundaryLocation"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="entities"/> is <c>null</c>.</exception>
+        public IEnumerable<HydraulicBoundaryLocation> ConvertEntityToModel(ICollection<HydraulicLocationEntity> entities)
         {
-            if (entity == null)
+            if (entities == null)
             {
-                throw new ArgumentNullException("entity");
+                throw new ArgumentNullException("entities");
             }
-            
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation();
-            hydraulicBoundaryLocation.Id = entity.LocationId;
-            hydraulicBoundaryLocation.StorageId = entity.HydraulicLocationEntityId;
-            hydraulicBoundaryLocation.Name = entity.Name;
-            hydraulicBoundaryLocation.Location = new Point2D(Convert.ToDouble(entity.LocationX), Convert.ToDouble(entity.LocationY));
 
-            if (entity.DesignWaterLevel.HasValue)
+            foreach (var entity in entities)
             {
-                hydraulicBoundaryLocation.DesignWaterLevel = (double)entity.DesignWaterLevel;
-            }
+                HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(entity.LocationId, entity.Name, Convert.ToDouble(entity.LocationX), Convert.ToDouble(entity.LocationY))
+                {
+                    StorageId = entity.HydraulicLocationEntityId,
+                };
 
-            return hydraulicBoundaryLocation;
+                if (entity.DesignWaterLevel.HasValue)
+                {
+                    hydraulicBoundaryLocation.DesignWaterLevel = (double)entity.DesignWaterLevel;
+                }
+
+                yield return hydraulicBoundaryLocation;
+            }
         }
 
+        /// <summary>
+        /// Converts <paramref name="modelObject"/> to <paramref name="entity"/>.
+        /// </summary>
+        /// <param name="modelObject">The <see cref="HydraulicBoundaryLocation"/> to convert.</param>
+        /// <param name="entity">A reference to the <see cref="HydraulicLocationEntity"/> to be saved.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="modelObject"/> or <paramref name="entity"/> is <c>null</c>.</exception>
         public void ConvertModelToEntity(HydraulicBoundaryLocation modelObject, HydraulicLocationEntity entity)
         {
             if (modelObject == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikeAssessmentSectionEntityPersistor.cs
===================================================================
diff -u -rd242e89e13ef602facae6a1ef91660242bcef340 -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikeAssessmentSectionEntityPersistor.cs	(.../DikeAssessmentSectionEntityPersistor.cs)	(revision d242e89e13ef602facae6a1ef91660242bcef340)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikeAssessmentSectionEntityPersistor.cs	(.../DikeAssessmentSectionEntityPersistor.cs)	(revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c)
@@ -74,9 +74,9 @@
         {
             var dikeAssessmentSection = converter.ConvertEntityToModel(entity);
 
-            foreach (var hydraulicLocationEntity in entity.HydraulicLocationEntities)
+            if (dikeAssessmentSection.HydraulicBoundaryDatabase != null)
             {
-                dikeAssessmentSection.HydraulicBoundaryDatabase.Locations.Add(hydraulicLocationEntityPersistor.LoadModel(hydraulicLocationEntity));
+                dikeAssessmentSection.HydraulicBoundaryDatabase.Locations.AddRange(hydraulicLocationEntityPersistor.LoadModel(entity.HydraulicLocationEntities));
             }
 
             foreach (var failureMechanismEntity in entity.FailureMechanismEntities)
@@ -202,15 +202,9 @@
         private void InsertChildren(DikeAssessmentSection model, DikeAssessmentSectionEntity entity)
         {
             dikePipingFailureMechanismEntityPersistor.InsertModel(entity.FailureMechanismEntities, model.PipingFailureMechanism);
+            hydraulicLocationEntityPersistor.InsertModel(entity.HydraulicLocationEntities, model.HydraulicBoundaryDatabase);
+            
             dikePipingFailureMechanismEntityPersistor.RemoveUnModifiedEntries(entity.FailureMechanismEntities);
-
-            if (model.HydraulicBoundaryDatabase != null)
-            {
-                foreach (var hydraulicBoundaryLocation in model.HydraulicBoundaryDatabase.Locations)
-                {
-                    hydraulicLocationEntityPersistor.InsertModel(entity.HydraulicLocationEntities, hydraulicBoundaryLocation, 0);
-                }
-            }
             hydraulicLocationEntityPersistor.RemoveUnModifiedEntries(entity.HydraulicLocationEntities);
         }
 
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/HydraulicLocationEntityPersistor.cs
===================================================================
diff -u -rd242e89e13ef602facae6a1ef91660242bcef340 -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/HydraulicLocationEntityPersistor.cs	(.../HydraulicLocationEntityPersistor.cs)	(revision d242e89e13ef602facae6a1ef91660242bcef340)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/HydraulicLocationEntityPersistor.cs	(.../HydraulicLocationEntityPersistor.cs)	(revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data.Entity;
 using System.Linq;
 using Application.Ringtoets.Storage.Converters;
 using Application.Ringtoets.Storage.DbContext;
@@ -58,68 +59,124 @@
             converter = new HydraulicLocationConverter();
         }
 
-        public void UpdateModel(ICollection<HydraulicLocationEntity> parentNavigationProperty, HydraulicBoundaryLocation model, int order)
+        /// <summary>
+        /// Loads the <see cref="HydraulicLocationEntity"/> as <see cref="HydraulicBoundaryLocation"/>.
+        /// </summary>
+        /// <param name="entities">The <see cref="HydraulicLocationEntity"/> to load.</param>
+        /// <returns>A new instance of <see cref="HydraulicBoundaryLocation"/>, based on the properties of <paramref name="entities"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="entities"/> is <c>null</c>.</exception>
+        public IEnumerable<HydraulicBoundaryLocation> LoadModel(ICollection<HydraulicLocationEntity> entities)
         {
-            if (model == null)
+            if (entities == null)
             {
-                throw new ArgumentNullException("model");
+                throw new ArgumentNullException("entities");
             }
 
-            if (model.StorageId < 1)
+            return converter.ConvertEntityToModel(entities);
+        }
+
+        /// <summary>
+        /// Ensures that the <paramref name="model"/> is set as <see cref="HydraulicLocationEntity"/> in the <paramref name="parentNavigationProperty"/>.
+        /// All other <see cref="HydraulicLocationEntity"/> in <paramref name="parentNavigationProperty"/> will be removed.
+        /// </summary>
+        /// <param name="parentNavigationProperty">Collection where <see cref="HydraulicBoundaryLocation"/> objects can be searched and added. 
+        /// Usually, this collection is a navigation property of a <see cref="IDbSet{HydraulicLocationEntity}"/>.</param>
+        /// <param name="model">The <see cref="HydraulicBoundaryLocation"/> to be saved in the storage.</param>
+        public void UpdateModel(ICollection<HydraulicLocationEntity> parentNavigationProperty, HydraulicBoundaryDatabase model)
+        {
+            if (model == null)
             {
-                InsertModel(parentNavigationProperty, model, 0);
-                return;
+                throw new ArgumentNullException("model");
             }
 
             if (parentNavigationProperty == null)
             {
                 throw new ArgumentNullException("parentNavigationProperty");
             }
 
-            HydraulicLocationEntity entity;
-            try
+            foreach (var location in model.Locations)
             {
-                entity = parentNavigationProperty.SingleOrDefault(db => db.HydraulicLocationEntityId == model.StorageId);
+                if (location == null)
+                {
+                    throw new ArgumentException("Null location cannot be added");
+                }
+
+                if (location.StorageId < 1)
+                {
+                    InsertLocation(parentNavigationProperty, location);
+                    continue;
+                }
+
+                HydraulicLocationEntity entity;
+                try
+                {
+                    entity = parentNavigationProperty.SingleOrDefault(db => db.HydraulicLocationEntityId == location.StorageId);
+                }
+                catch (InvalidOperationException exception)
+                {
+                    throw new EntityNotFoundException(String.Format(Resources.Error_Entity_Not_Found_0_1, "HydraulicLocationEntity", location.StorageId), exception);
+                }
+
+                if (entity == null)
+                {
+                    throw new EntityNotFoundException(String.Format(Resources.Error_Entity_Not_Found_0_1, "HydraulicLocationEntity", location.StorageId));
+                }
+
+                modifiedList.Add(entity);
+
+                converter.ConvertModelToEntity(location, entity);
             }
-            catch (InvalidOperationException exception)
-            {
-                throw new EntityNotFoundException(String.Format(Resources.Error_Entity_Not_Found_0_1, "HydraulicLocationEntity", model.StorageId), exception);
-            }
+        }
 
-            if (entity == null)
+        private void InsertLocation(ICollection<HydraulicLocationEntity> parentNavigationProperty, HydraulicBoundaryLocation location)
+        {
+            if (location == null)
             {
-                throw new EntityNotFoundException(String.Format(Resources.Error_Entity_Not_Found_0_1, "HydraulicLocationEntity", model.StorageId));
+                throw new ArgumentNullException("location");
             }
 
-            modifiedList.Add(entity);
+            var entity = new HydraulicLocationEntity();
+            parentNavigationProperty.Add(entity);
+            insertedList.Add(entity, location);
 
-            converter.ConvertModelToEntity(model, entity);
+            converter.ConvertModelToEntity(location, entity);
+
+            if (location.StorageId > 0)
+            {
+                modifiedList.Add(entity);
+            }
         }
 
-        public void InsertModel(ICollection<HydraulicLocationEntity> parentNavigationProperty, HydraulicBoundaryLocation model, int order)
+        /// <summary>
+        /// Ensures that the <paramref name="hydraulicBoundaryDatabase"/> is added as <see cref="HydraulicLocationEntity"/> in the <paramref name="parentNavigationProperty"/>.
+        /// All other <see cref="HydraulicLocationEntity"/> in <paramref name="parentNavigationProperty"/> will be removed.
+        /// </summary>
+        /// <param name="parentNavigationProperty">Collection where <see cref="HydraulicLocationEntity"/> objects can be added.
+        ///  Usually, this collection is a navigation property of a <see cref="IDbSet{HydraulicLocationEntity}"/>.</param>
+        /// <param name="hydraulicBoundaryDatabase">The <see cref="HydraulicBoundaryLocation"/> to be saved in the storage.</param>
+        public void InsertModel(ICollection<HydraulicLocationEntity> parentNavigationProperty, HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
         {
             if (parentNavigationProperty == null)
             {
                 throw new ArgumentNullException("parentNavigationProperty");
             }
 
-            if (model == null)
+            if (hydraulicBoundaryDatabase == null)
             {
-                throw new ArgumentNullException("model");
+                return;
             }
 
-            var entity = new HydraulicLocationEntity();
-            parentNavigationProperty.Add(entity);
-            insertedList.Add(entity, model);
-
-            converter.ConvertModelToEntity(model, entity);
-
-            if (model.StorageId > 0)
+            foreach (var location in hydraulicBoundaryDatabase.Locations)
             {
-                modifiedList.Add(entity);
+                InsertLocation(parentNavigationProperty, location);
             }
         }
 
+        /// <summary>
+        /// Removes all entities from <see cref="IRingtoetsEntities.ProjectEntities"/> that are not marked as 'updated'.
+        /// </summary>
+        /// <param name="parentNavigationProperty">List where <see cref="HydraulicLocationEntity"/> objects can be searched. 
+        /// Usually, this collection is a navigation property of a <see cref="IDbSet{HydraulicLocationEntity}"/>.</param>
         public void RemoveUnModifiedEntries(ICollection<HydraulicLocationEntity> parentNavigationProperty)
         {
             var originalList = parentNavigationProperty.ToList();
@@ -140,6 +197,9 @@
             modifiedList.Clear();
         }
 
+        /// <summary>
+        /// Perform actions that can only be executed after <see cref="IRingtoetsEntities.SaveChanges"/> has been called.
+        /// </summary>
         public void PerformPostSaveActions()
         {
             foreach (var entry in insertedList)
@@ -148,15 +208,5 @@
             }
             insertedList.Clear();
         }
-
-        public HydraulicBoundaryLocation LoadModel(HydraulicLocationEntity entity)
-        {
-            if (entity == null)
-            {
-                throw new ArgumentNullException("entity");
-            }
-
-            return converter.ConvertEntityToModel(entity);
-        }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/HydraulicLocationConverterTest.cs
===================================================================
diff -u -rd242e89e13ef602facae6a1ef91660242bcef340 -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/HydraulicLocationConverterTest.cs	(.../HydraulicLocationConverterTest.cs)	(revision d242e89e13ef602facae6a1ef91660242bcef340)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/HydraulicLocationConverterTest.cs	(.../HydraulicLocationConverterTest.cs)	(revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c)
@@ -20,6 +20,9 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
 using Application.Ringtoets.Storage.Converters;
 using Application.Ringtoets.Storage.DbContext;
 using NUnit.Framework;
@@ -31,27 +34,17 @@
     public class HydraulicLocationConverterTest
     {
         [Test]
-        public void Constructor_Always_NewInstance()
-        {
-            // Call
-            HydraulicLocationConverter converter = new HydraulicLocationConverter();
-
-            // Assert
-            Assert.IsInstanceOf<IEntityConverter<HydraulicBoundaryLocation, HydraulicLocationEntity>>(converter);
-        }
-
-        [Test]
         public void ConvertEntityToModel_NullEntity_ThrowsArgumentNullException()
         {
             // Setup
             HydraulicLocationConverter converter = new HydraulicLocationConverter();
 
             // Call
-            TestDelegate test = () => converter.ConvertEntityToModel(null);
+            TestDelegate test = () => converter.ConvertEntityToModel(null).ToList();
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("entity", exception.ParamName);
+            Assert.AreEqual("entities", exception.ParamName);
         }
 
         [Test]
@@ -76,9 +69,11 @@
             HydraulicLocationConverter converter = new HydraulicLocationConverter();
 
             // Call
-            HydraulicBoundaryLocation location = converter.ConvertEntityToModel(entity);
+            List<HydraulicBoundaryLocation> locations = converter.ConvertEntityToModel(new List<HydraulicLocationEntity> {entity}).ToList();
 
             // Assert
+            Assert.AreEqual(1, locations.Count);
+            var location = locations[0];
             Assert.AreNotEqual(entity, location);
             Assert.AreEqual(locationId, location.Id);
             Assert.AreEqual(storageId, location.StorageId);
@@ -109,7 +104,7 @@
             HydraulicLocationConverter converter = new HydraulicLocationConverter();
 
             // Call
-            TestDelegate test = () => converter.ConvertModelToEntity(new HydraulicBoundaryLocation(), null);
+            TestDelegate test = () => converter.ConvertModelToEntity(new HydraulicBoundaryLocation(1, "test", 1, 1), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/ReferenceLineConverterTest.cs
===================================================================
diff -u -rd242e89e13ef602facae6a1ef91660242bcef340 -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/ReferenceLineConverterTest.cs	(.../ReferenceLineConverterTest.cs)	(revision d242e89e13ef602facae6a1ef91660242bcef340)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/ReferenceLineConverterTest.cs	(.../ReferenceLineConverterTest.cs)	(revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Application.Ringtoets.Storage.Converters;
 using Application.Ringtoets.Storage.DbContext;
 using NUnit.Framework;
@@ -32,27 +33,17 @@
     public class ReferenceLineConverterTest
     {
         [Test]
-        public void Constructor_Always_NewInstance()
-        {
-            // Call
-            HydraulicLocationConverter converter = new HydraulicLocationConverter();
-
-            // Assert
-            Assert.IsInstanceOf<IEntityConverter<HydraulicBoundaryLocation, HydraulicLocationEntity>>(converter);
-        }
-
-        [Test]
         public void ConvertEntityToModel_NullEntity_ThrowsArgumentNullException()
         {
             // Setup
             HydraulicLocationConverter converter = new HydraulicLocationConverter();
 
             // Call
-            TestDelegate test = () => converter.ConvertEntityToModel(null);
+            TestDelegate test = () => converter.ConvertEntityToModel(null).ToList();
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("entity", exception.ParamName);
+            Assert.AreEqual("entities", exception.ParamName);
         }
 
         [Test]
@@ -77,9 +68,11 @@
             HydraulicLocationConverter converter = new HydraulicLocationConverter();
 
             // Call
-            HydraulicBoundaryLocation location = converter.ConvertEntityToModel(entity);
+            List<HydraulicBoundaryLocation> locations = converter.ConvertEntityToModel(new List<HydraulicLocationEntity> { entity }).ToList();
 
             // Assert
+            Assert.AreEqual(1, locations.Count);
+            var location = locations[0];
             Assert.AreNotEqual(entity, location);
             Assert.AreEqual(locationId, location.Id);
             Assert.AreEqual(storageId, location.StorageId);
@@ -110,7 +103,7 @@
             HydraulicLocationConverter converter = new HydraulicLocationConverter();
 
             // Call
-            TestDelegate test = () => converter.ConvertModelToEntity(new HydraulicBoundaryLocation(), null);
+            TestDelegate test = () => converter.ConvertModelToEntity(new HydraulicBoundaryLocation(1, "test", 1, 1), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/HydraulicLocationEntityPersistorTest.cs
===================================================================
diff -u -rd242e89e13ef602facae6a1ef91660242bcef340 -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/HydraulicLocationEntityPersistorTest.cs	(.../HydraulicLocationEntityPersistorTest.cs)	(revision d242e89e13ef602facae6a1ef91660242bcef340)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/HydraulicLocationEntityPersistorTest.cs	(.../HydraulicLocationEntityPersistorTest.cs)	(revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c)
@@ -36,15 +36,6 @@
     [TestFixture]
     public class HydraulicLocationEntityPersistorTest
     {
-        private static IEnumerable<Func<HydraulicBoundaryLocation>> TestCases
-        {
-            get
-            {
-                yield return () => null;
-                yield return null;
-            }
-        }
-
         [Test]
         public void Constructor_NullDataSet_ThrowsAgrumentNullException()
         {
@@ -87,7 +78,7 @@
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("entity", exception.ParamName);
+            Assert.AreEqual("entities", exception.ParamName);
             mocks.VerifyAll();
         }
 
@@ -117,9 +108,11 @@
             };
 
             // Call
-            HydraulicBoundaryLocation location = persistor.LoadModel(entity);
+            List<HydraulicBoundaryLocation> locations = persistor.LoadModel(new List<HydraulicLocationEntity>{entity}).ToList();
 
             // Assert
+            Assert.AreEqual(1, locations.Count);
+            var location = locations[0];
             Assert.AreEqual(locationId, location.Id);
             Assert.AreEqual(name, location.Name);
             Assert.AreEqual(designWaterLevel, location.DesignWaterLevel);
@@ -137,10 +130,12 @@
             var mocks = new MockRepository();
             var ringtoetsEntities = mocks.StrictMock<IRingtoetsEntities>();
             var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities);
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1, 1));
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => persistor.InsertModel(null, new HydraulicBoundaryLocation(), 0);
+            TestDelegate test = () => persistor.InsertModel(null, hydraulicBoundaryDatabase);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -150,48 +145,26 @@
         }
 
         [Test]
-        public void InsertModel_NullModel_ThrowsArgumentNullException()
+        public void InsertModel_NullModel_DoesNotAddEntityInParentNavigationProperty()
         {
             // Setup
             var mocks = new MockRepository();
             var ringtoetsEntities = mocks.StrictMock<IRingtoetsEntities>();
             var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities);
+            var parentNavigationProperty = new List<HydraulicLocationEntity>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => persistor.InsertModel(new List<HydraulicLocationEntity>(), null, 0);
+            TestDelegate test = () => persistor.InsertModel(parentNavigationProperty, null);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("model", exception.ParamName);
+            Assert.DoesNotThrow(test);
+            CollectionAssert.AreEquivalent(new List<HydraulicLocationEntity>(), parentNavigationProperty);
 
             mocks.VerifyAll();
         }
 
         [Test]
-        public void InsertModel_EmptyDatasetValidModel_ValidEntityInDataModel()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var ringtoetsEntities = mocks.StrictMock<IRingtoetsEntities>();
-            var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities);
-            IList<HydraulicLocationEntity> parentNavigationProperty = new List<HydraulicLocationEntity>();
-            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation();
-            mocks.ReplayAll();
-
-            // Call
-            persistor.InsertModel(parentNavigationProperty, model, 0);
-
-            // Assert
-            Assert.AreEqual(1, parentNavigationProperty.Count);
-            var entity = parentNavigationProperty[0];
-            Assert.AreNotEqual(model, entity);
-            Assert.IsNaN(entity.DesignWaterLevel);
-
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void InsertModel_SingleEntityInParentNavigationPropertyHydraulicLocationWithSameStorageId_HydraulicLocationAsEntityInParentNavigationProperty()
         {
             // Setup
@@ -210,15 +183,18 @@
                 entityToDelete
             };
 
-            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation
+            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation(13001, "test", 13, 52)
             {
                 StorageId = storageId
             };
 
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(model);
+
             mocks.ReplayAll();
 
             // Call
-            persistor.InsertModel(parentNavigationProperty, model, 0);
+            persistor.InsertModel(parentNavigationProperty, hydraulicBoundaryDatabase);
 
             // Assert
             Assert.AreEqual(2, parentNavigationProperty.Count);
@@ -230,6 +206,28 @@
         }
 
         [Test]
+        public void InsertModel_LocationNull_ThrowsArgumentNullException()
+        {
+            var mocks = new MockRepository();
+            var ringtoetsEntities = mocks.StrictMock<IRingtoetsEntities>();
+            var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities);
+            IList<HydraulicLocationEntity> parentNavigationProperty = new List<HydraulicLocationEntity>();
+
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(null);
+
+            mocks.ReplayAll();
+
+            // Call
+            TestDelegate test = () => persistor.InsertModel(parentNavigationProperty, hydraulicBoundaryDatabase);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void UpdateModel_NullDatasetValidModel_ThrowsArgumentNullException()
         {
             // Setup
@@ -239,13 +237,16 @@
             var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities);
             mocks.ReplayAll();
 
-            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation
+            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation(13001, "test", 13, 52)
             {
                 StorageId = storageId
             };
 
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(model);
+
             // Call
-            TestDelegate test = () => persistor.UpdateModel(null, model, 0);
+            TestDelegate test = () => persistor.UpdateModel(null, hydraulicBoundaryDatabase);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -265,7 +266,7 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, null, 0);
+            TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -284,15 +285,18 @@
             var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities);
             IList<HydraulicLocationEntity> parentNavigationProperty = new List<HydraulicLocationEntity>();
 
-            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation
+            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation(13001, "test", 13, 52)
             {
                 StorageId = storageId
             };
 
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(model);
+
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, model, 0);
+            TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase);
 
             // Assert
             var exception = Assert.Throws<EntityNotFoundException>(test);
@@ -321,15 +325,18 @@
                 }
             };
 
-            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation
+            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation(13001, "test", 13, 52)
             {
                 StorageId = storageId
             };
 
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(model);
+
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, model, 0);
+            TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase);
 
             // Assert
             var exception = Assert.Throws<EntityNotFoundException>(test);
@@ -354,15 +361,18 @@
                 }
             };
 
-            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation
+            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation(13001, "test", 13, 52)
             {
                 StorageId = storageId
             };
 
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(model);
+
             mocks.ReplayAll();
 
             // Call
-            persistor.UpdateModel(parentNavigationProperty, model, 0);
+            persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase);
 
             // Assert
             Assert.AreEqual(1, parentNavigationProperty.Count);
@@ -380,15 +390,18 @@
             var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities);
             IList<HydraulicLocationEntity> parentNavigationProperty = new List<HydraulicLocationEntity>();
 
-            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation
+            HydraulicBoundaryLocation model = new HydraulicBoundaryLocation(13001, "test", 13, 52)
             {
                 StorageId = 0
             };
 
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(model);
+
             mocks.ReplayAll();
 
             // Call
-            persistor.UpdateModel(parentNavigationProperty, model, 0);
+            persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase);
 
             // Assert
             Assert.AreEqual(1, parentNavigationProperty.Count);
@@ -397,6 +410,28 @@
         }
 
         [Test]
+        public void UpdateModel_LocationNull_ThrowsArgumentException()
+        {
+            var mocks = new MockRepository();
+            var ringtoetsEntities = mocks.StrictMock<IRingtoetsEntities>();
+            var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities);
+            IList<HydraulicLocationEntity> parentNavigationProperty = new List<HydraulicLocationEntity>();
+
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(null);
+
+            mocks.ReplayAll();
+
+            // Call
+            TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase);
+
+            // Assert
+            Assert.Throws<ArgumentException>(test);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void RemoveUnModifiedEntries_SingleEntityInParentNavigationPropertySingleHydraulicLocationWithoutStorageId_UpdatedHydraulicLocationAsEntityInParentNavigationPropertyAndOthersDeletedInDbSet()
         {
             // Setup
@@ -420,11 +455,13 @@
             ringtoetsEntities.Expect(x => x.HydraulicLocationEntities).Return(dbset);
 
             HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities);
-            HydraulicBoundaryLocation location = new HydraulicBoundaryLocation();
+            HydraulicBoundaryLocation location = new HydraulicBoundaryLocation(13001, "test", 13, 52);
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(location);
             mocks.ReplayAll();
 
             // Call
-            persistor.UpdateModel(parentNavigationProperty, location, 0);
+            persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase);
             persistor.RemoveUnModifiedEntries(parentNavigationProperty);
 
             // Assert
@@ -463,13 +500,16 @@
             ringtoetsEntities.Expect(x => x.HydraulicLocationEntities).Return(dbset);
 
             HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities);
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(13001, "test", 13, 52)
             {
                 StorageId = storageId
             };
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
+
             mocks.ReplayAll();
 
-            TestDelegate updateTest = () => persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryLocation, 0);
+            TestDelegate updateTest = () => persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase);
             Assert.DoesNotThrow(updateTest, "Precondition failed: Update should not throw exception.");
 
             // Call
@@ -510,10 +550,12 @@
             ringtoetsEntities.Expect(x => x.HydraulicLocationEntities).Return(dbset).Repeat.Twice();
             HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities);
 
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation();
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(13001, "test", 13, 52);
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
             mocks.ReplayAll();
 
-            TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryLocation, 0);
+            TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase);
             Assert.DoesNotThrow(test, "Precondition failed: UpdateModel");
 
             // Call
@@ -561,27 +603,27 @@
             IList<HydraulicBoundaryLocation> hydraulicLocations = new List<HydraulicBoundaryLocation>();
             for (var i = 0; i < numberOfInserts; i++)
             {
-                hydraulicLocations.Add(new HydraulicBoundaryLocation
+                hydraulicLocations.Add(new HydraulicBoundaryLocation(13001, "test", 13, 52)
                 {
                     StorageId = 0L
                 });
             }
 
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.AddRange(hydraulicLocations);
+
             var ringtoetsEntities = mocks.StrictMock<IRingtoetsEntities>();
             HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities);
             mocks.ReplayAll();
 
-            foreach (var hydraulicLocation in hydraulicLocations)
+            try
             {
-                try
-                {
-                    persistor.UpdateModel(parentNavigationPropertyMock, hydraulicLocation, 0);
-                }
-                catch (Exception)
-                {
-                    Assert.Fail("Precondition failed: persistor.UpdateModel");
-                }
+                persistor.UpdateModel(parentNavigationPropertyMock, hydraulicBoundaryDatabase);
             }
+            catch (Exception)
+            {
+                Assert.Fail("Precondition failed: persistor.UpdateModel");
+            }
 
             // Call
             for (var i = 0; i < insertedHydraulicLocationEntities.Count; i++)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj
===================================================================
diff -u -rfadb006ef0285eb3fdbdbfc805729b37c8dbc0e6 -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj	(.../Application.Ringtoets.Storage.TestUtil.csproj)	(revision fadb006ef0285eb3fdbdbfc805729b37c8dbc0e6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj	(.../Application.Ringtoets.Storage.TestUtil.csproj)	(revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c)
@@ -73,6 +73,10 @@
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Ringtoets\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
+      <Project>{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}</Project>
+      <Name>Ringtoets.HydraRing.Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Ringtoets\Integration\src\Ringtoets.Integration.Data\Ringtoets.Integration.Data.csproj">
       <Project>{11F1F874-45AF-43E4-8AE5-15A5C9593E28}</Project>
       <Name>Ringtoets.Integration.Data</Name>
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectHelper.cs
===================================================================
diff -u -r2ae1c9433c3c28b32105b9778b682b5e512a0f00 -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectHelper.cs	(.../RingtoetsProjectHelper.cs)	(revision 2ae1c9433c3c28b32105b9778b682b5e512a0f00)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectHelper.cs	(.../RingtoetsProjectHelper.cs)	(revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c)
@@ -19,7 +19,9 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
 using Core.Common.Base.Data;
+using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Data;
 
 namespace Application.Ringtoets.Storage.TestUtil
@@ -43,10 +45,23 @@
                 {
                     new DikeAssessmentSection
                     {
-                        Name = "dikeAssessmentSection"
+                        Name = "dikeAssessmentSection",
+                        HydraulicBoundaryDatabase = GetHydraulicBoundaryDatabase()
                     }
                 }
             };
         }
+
+        private static HydraulicBoundaryDatabase GetHydraulicBoundaryDatabase()
+        {
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = "/temp/test",
+                Version = "1.0"
+            };
+            hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(13001, "test", 152.3, 2938.5));
+
+            return hydraulicBoundaryDatabase;
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryDatabase.cs
===================================================================
diff -u -r20cf7c61dec992770e5e59193f1922c960341495 -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryDatabase.cs	(.../HydraulicBoundaryDatabase.cs)	(revision 20cf7c61dec992770e5e59193f1922c960341495)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryDatabase.cs	(.../HydraulicBoundaryDatabase.cs)	(revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c)
@@ -51,7 +51,7 @@
         /// <summary>
         /// Gets the hydraulic boundary locations.
         /// </summary>
-        public ICollection<HydraulicBoundaryLocation> Locations { get; private set; }
+        public List<HydraulicBoundaryLocation> Locations { get; private set; }
 
         /// <summary>
         /// Clears all the locations from the <see cref="HydraulicBoundaryDatabase"/>.
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs
===================================================================
diff -u -raf521f167fabb7052a06e6a3d12575d3c3f18ab4 -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision af521f167fabb7052a06e6a3d12575d3c3f18ab4)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c)
@@ -34,14 +34,6 @@
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicBoundaryLocation"/>.
         /// </summary>
-        public HydraulicBoundaryLocation()
-        {
-            DesignWaterLevel = Double.NaN;
-        }
-
-        /// <summary>
-        /// Creates a new instance of <see cref="HydraulicBoundaryLocation"/>.
-        /// </summary>
         /// <param name="id">Id of the <see cref="HydraulicBoundaryLocation"/>.</param>
         /// <param name="name">Name of the <see cref="HydraulicBoundaryLocation"/>.</param>
         /// <param name="coordinateX">X coordinate of the <see cref="HydraulicBoundaryLocation"/>.</param>
@@ -62,17 +54,17 @@
         /// <summary>
         /// Gets the database id of <see cref="HydraulicBoundaryLocation"/>.
         /// </summary>
-        public long Id { get; set; }
+        public long Id { get; private set; }
 
         /// <summary>
         /// Gets the name of <see cref="HydraulicBoundaryLocation"/>.
         /// </summary>
-        public string Name { get; set; }
+        public string Name { get; private set; }
 
         /// <summary>
         /// Gets the coordinates of <see cref="HydraulicBoundaryLocation"/>.
         /// </summary>
-        public Point2D Location { get; set; }
+        public Point2D Location { get; private set; }
 
         /// <summary>
         /// Gets the design water level of <see cref="HydraulicBoundaryLocation"/>.
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Data.Test/HydraulicBoundaryLocationTest.cs
===================================================================
diff -u -r5efe386d38b0b0686283bae9952a47e29aa6b7b1 -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Data.Test/HydraulicBoundaryLocationTest.cs	(.../HydraulicBoundaryLocationTest.cs)	(revision 5efe386d38b0b0686283bae9952a47e29aa6b7b1)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Data.Test/HydraulicBoundaryLocationTest.cs	(.../HydraulicBoundaryLocationTest.cs)	(revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c)
@@ -44,21 +44,6 @@
         }
 
         [Test]
-        public void Constructor_WithoutParameters_PropertiesAsExpected()
-        {
-            // Call
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation();
-
-            // Assert
-            Assert.IsInstanceOf<Observable>(hydraulicBoundaryLocation);
-            Assert.IsInstanceOf<HydraulicBoundaryLocation>(hydraulicBoundaryLocation);
-            Assert.AreEqual(0, hydraulicBoundaryLocation.Id);
-            Assert.IsNull(hydraulicBoundaryLocation.Name);
-            Assert.IsNull(hydraulicBoundaryLocation.Location);
-            Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel);
-        }
-
-        [Test]
         public void Constructor_ValidParameters_PropertiesAsExpected()
         {
             // Setup