Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -radfa3c3e4d889f4038d1add832f3ea16aaeaadac -r92a966a0a5ae5144b90b89be0cdf30c5eea25d7d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision adfa3c3e4d889f4038d1add832f3ea16aaeaadac)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 92a966a0a5ae5144b90b89be0cdf30c5eea25d7d)
@@ -76,6 +76,8 @@
     </Compile>
     <Compile Include="Persistors\DikeAssessmentSectionEntityPersistor.cs" />
     <Compile Include="Persistors\FailureMechanismEntityPersistorBase.cs" />
+    <Compile Include="Persistors\HydraulicLocationEntityPersistor.cs" />
+    <Compile Include="Persistors\ICollectionPersistor.cs" />
     <Compile Include="Persistors\IPersistor.cs" />
     <Compile Include="Persistors\DikesPipingFailureMechanismEntityPersistor.cs" />
     <Compile Include="Persistors\ProjectEntityPersistor.cs" />
@@ -124,6 +126,11 @@
       <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>
+      <Private>False</Private>
+    </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/src/Application.Ringtoets.Storage/Converters/DikeAssessmentSectionEntityConverter.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r92a966a0a5ae5144b90b89be0cdf30c5eea25d7d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/DikeAssessmentSectionEntityConverter.cs	(.../DikeAssessmentSectionEntityConverter.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/DikeAssessmentSectionEntityConverter.cs	(.../DikeAssessmentSectionEntityConverter.cs)	(revision 92a966a0a5ae5144b90b89be0cdf30c5eea25d7d)
@@ -21,6 +21,7 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
+using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Data;
 
 namespace Application.Ringtoets.Storage.Converters
@@ -53,6 +54,15 @@
                 }
             };
 
+            if (entity.HydraulicDatabaseLocation != null && entity.HydraulicDatabaseVersion != null)
+            {
+                dikeAssessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                {
+                    FilePath = entity.HydraulicDatabaseLocation,
+                    Version = entity.HydraulicDatabaseVersion
+                };
+            }
+
             return dikeAssessmentSection;
         }
 
@@ -78,6 +88,12 @@
             entity.DikeAssessmentSectionEntityId = modelObject.StorageId;
             entity.Name = modelObject.Name;
             entity.Norm = modelObject.FailureMechanismContribution.Norm;
+
+            if (modelObject.HydraulicBoundaryDatabase != null)
+            {
+                entity.HydraulicDatabaseLocation = modelObject.HydraulicBoundaryDatabase.FilePath;
+                entity.HydraulicDatabaseVersion = modelObject.HydraulicBoundaryDatabase.Version;
+            }
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikeAssessmentSectionEntityPersistor.cs
===================================================================
diff -u -r8dec462b18aff76313f2836309ef24ddd2f70b50 -r92a966a0a5ae5144b90b89be0cdf30c5eea25d7d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikeAssessmentSectionEntityPersistor.cs	(.../DikeAssessmentSectionEntityPersistor.cs)	(revision 8dec462b18aff76313f2836309ef24ddd2f70b50)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikeAssessmentSectionEntityPersistor.cs	(.../DikeAssessmentSectionEntityPersistor.cs)	(revision 92a966a0a5ae5144b90b89be0cdf30c5eea25d7d)
@@ -43,6 +43,7 @@
         private readonly ICollection<DikeAssessmentSectionEntity> modifiedList = new List<DikeAssessmentSectionEntity>();
 
         private readonly DikesPipingFailureMechanismEntityPersistor dikePipingFailureMechanismEntityPersistor;
+        private readonly HydraulicLocationEntityPersistor hydraulicLocationEntityPersistor;
 
         /// <summary>
         /// New instance of <see cref="DikeAssessmentSectionEntityPersistor"/>.
@@ -60,6 +61,7 @@
             converter = new DikeAssessmentSectionEntityConverter();
 
             dikePipingFailureMechanismEntityPersistor = new DikesPipingFailureMechanismEntityPersistor(dbContext);
+            hydraulicLocationEntityPersistor = new HydraulicLocationEntityPersistor(dbContext);
         }
 
         /// <summary>
@@ -71,6 +73,11 @@
         {
             var dikeAssessmentSection = converter.ConvertEntityToModel(entity);
 
+            foreach (var hydraulicLocationEntity in entity.HydraulicLocationEntities)
+            {
+                hydraulicLocationEntityPersistor.LoadModel(hydraulicLocationEntity, dikeAssessmentSection.HydraulicBoundaryDatabase.Locations);   
+            }
+
             foreach (var failureMechanismEntity in entity.FailureMechanismEntities)
             {
                 if (failureMechanismEntity.FailureMechanismType == (int) FailureMechanismType.DikesPipingFailureMechanism)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikesPipingFailureMechanismEntityPersistor.cs
===================================================================
diff -u -r8dec462b18aff76313f2836309ef24ddd2f70b50 -r92a966a0a5ae5144b90b89be0cdf30c5eea25d7d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikesPipingFailureMechanismEntityPersistor.cs	(.../DikesPipingFailureMechanismEntityPersistor.cs)	(revision 8dec462b18aff76313f2836309ef24ddd2f70b50)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikesPipingFailureMechanismEntityPersistor.cs	(.../DikesPipingFailureMechanismEntityPersistor.cs)	(revision 92a966a0a5ae5144b90b89be0cdf30c5eea25d7d)
@@ -21,6 +21,7 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
+using Ringtoets.Common.Data;
 using Ringtoets.Piping.Data;
 
 namespace Application.Ringtoets.Storage.Persistors
@@ -47,7 +48,7 @@
         /// <item><paramref name="model"/> is <c>null</c>.</item>
         /// </list></exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="entity"/> is not of type <see cref="FailureMechanismType.DikesPipingFailureMechanism"/>.</exception>
-        public void LoadModel(FailureMechanismEntity entity, PipingFailureMechanism model)
+        public override void LoadModel(FailureMechanismEntity entity, IFailureMechanism model)
         {
             ConvertEntityToModel(entity, model);
             if (entity.FailureMechanismType != (int) FailureMechanismType.DikesPipingFailureMechanism)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/FailureMechanismEntityPersistorBase.cs
===================================================================
diff -u -r8dec462b18aff76313f2836309ef24ddd2f70b50 -r92a966a0a5ae5144b90b89be0cdf30c5eea25d7d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/FailureMechanismEntityPersistorBase.cs	(.../FailureMechanismEntityPersistorBase.cs)	(revision 8dec462b18aff76313f2836309ef24ddd2f70b50)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/FailureMechanismEntityPersistorBase.cs	(.../FailureMechanismEntityPersistorBase.cs)	(revision 92a966a0a5ae5144b90b89be0cdf30c5eea25d7d)
@@ -34,7 +34,7 @@
     /// <summary>
     /// Persistor for classes derived from <see cref="BaseFailureMechanism"/>.
     /// </summary>
-    public abstract class FailureMechanismEntityPersistorBase
+    public abstract class FailureMechanismEntityPersistorBase : ICollectionPersistor<FailureMechanismEntity, IFailureMechanism>
     {
         private readonly IRingtoetsEntities dbContext;
         private readonly Dictionary<FailureMechanismEntity, IFailureMechanism> insertedList = new Dictionary<FailureMechanismEntity, IFailureMechanism>();
@@ -91,6 +91,8 @@
             insertedList.Clear();
         }
 
+        public abstract void LoadModel(FailureMechanismEntity entity, IFailureMechanism model);
+
         /// <summary>
         /// Ensures that the model is added as <see cref="FailureMechanismEntity"/> in the <paramref name="parentNavigationProperty"/>.
         /// </summary>
@@ -178,7 +180,7 @@
         /// <item><paramref name="entity"/> is <c>null</c>.</item>
         /// <item><paramref name="model"/> is <c>null</c>.</item>
         /// </list></exception>
-        protected static void ConvertEntityToModel(FailureMechanismEntity entity, IFailureMechanism model)
+        public void ConvertEntityToModel(FailureMechanismEntity entity, IFailureMechanism model)
         {
             if (entity == null)
             {
@@ -199,7 +201,7 @@
         /// <exception cref="ArgumentNullException">Thrown when: <list type="bullet">
         /// <item><paramref name="model"/> is <c>null</c>.</item>
         /// </list></exception>
-        private static void ConvertModelToEntity(IFailureMechanism model, FailureMechanismEntity entity)
+        public void ConvertModelToEntity(IFailureMechanism model, FailureMechanismEntity entity)
         {
             if (model == null)
             {
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/HydraulicLocationEntityPersistor.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/HydraulicLocationEntityPersistor.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/HydraulicLocationEntityPersistor.cs	(revision 92a966a0a5ae5144b90b89be0cdf30c5eea25d7d)
@@ -0,0 +1,72 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Application.Ringtoets.Storage.DbContext;
+using Ringtoets.HydraRing.Data;
+
+namespace Application.Ringtoets.Storage.Persistors
+{
+    public class HydraulicLocationEntityPersistor : ICollectionPersistor<HydraulicLocationEntity, ICollection<HydraulicBoundaryLocation>>
+    {
+        private readonly IRingtoetsEntities ringtoetsContext;
+
+        public HydraulicLocationEntityPersistor(IRingtoetsEntities ringtoetsContext)
+        {
+            this.ringtoetsContext = ringtoetsContext;
+        }
+
+        public void RemoveUnModifiedEntries(ICollection<HydraulicLocationEntity> parentNavigationProperty)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void PerformPostSaveActions()
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void LoadModel(HydraulicLocationEntity entity, ICollection<HydraulicBoundaryLocation> model)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void InsertModel(ICollection<HydraulicLocationEntity> parentNavigationProperty, ICollection<HydraulicBoundaryLocation> model)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void UpdateModel(ICollection<HydraulicLocationEntity> parentNavigationProperty, ICollection<HydraulicBoundaryLocation> model)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void ConvertEntityToModel(HydraulicLocationEntity entity, ICollection<HydraulicBoundaryLocation> model)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void ConvertModelToEntity(ICollection<HydraulicBoundaryLocation> model, HydraulicLocationEntity entity)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ICollectionPersistor.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ICollectionPersistor.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ICollectionPersistor.cs	(revision 92a966a0a5ae5144b90b89be0cdf30c5eea25d7d)
@@ -0,0 +1,98 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Linq;
+using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.Exceptions;
+using Core.Common.Base.Storage;
+using Ringtoets.Common.Data;
+using Ringtoets.Piping.Data;
+
+namespace Application.Ringtoets.Storage.Persistors
+{
+    public interface ICollectionPersistor<TEntity, TModel> where TEntity : class
+    {
+        /// <summary>
+        /// All unmodified <see cref="TEntity"/> in <paramref name="parentNavigationProperty"/> will be removed.
+        /// </summary>
+        /// <param name="parentNavigationProperty">List where <see cref="TEntity"/> objects can be searched. Usually, this collection is a navigation property of a <see cref="IDbSet{TEntity}"/>.</param>
+        /// <exception cref="NotSupportedException">Thrown when the <paramref name="parentNavigationProperty"/> is read-only.</exception>
+        void RemoveUnModifiedEntries(ICollection<TEntity> parentNavigationProperty);
+
+        /// <summary>
+        /// Perform actions that can only be executed after <see cref="IRingtoetsEntities.SaveChanges"/> has been called.
+        /// </summary>
+        void PerformPostSaveActions();
+
+        void LoadModel(TEntity entity, TModel model);
+
+        /// <summary>
+        /// Ensures that the model is added as <see cref="TEntity"/> in the <paramref name="parentNavigationProperty"/>.
+        /// </summary>
+        /// <param name="parentNavigationProperty">Collection where <see cref="TEntity"/> objects can be added. Usually, this collection is a navigation property of a <see cref="IDbSet{TEntity}"/>.</param>
+        /// <param name="model"><see cref="TModel"/> to be saved in the storage.</param>
+        /// <exception cref="ArgumentNullException">Thrown when: <list type="bullet">
+        /// <item><paramref name="parentNavigationProperty"/> is <c>null</c>.</item>
+        /// <item><paramref name="model"/> is <c>null</c>.</item>
+        /// </list></exception>
+        void InsertModel(ICollection<TEntity> parentNavigationProperty, TModel model);
+
+        /// <summary>
+        /// Ensures that the <paramref name="model"/> is set as <see cref="TEntity"/> in the <paramref name="parentNavigationProperty"/>.
+        /// </summary>
+        /// <param name="parentNavigationProperty">Collection where <see cref="TEntity"/> objects can be searched and added. Usually, this collection is a navigation property of a <see cref="IDbSet{TEntity}"/>.</param>
+        /// <param name="model"><see cref="TModel"/> to be saved in the storage.</param>
+        /// <exception cref="ArgumentNullException">Thrown when: <list type="bullet">
+        /// <item><paramref name="parentNavigationProperty"/> is <c>null</c>.</item>
+        /// <item><paramref name="model"/> is <c>null</c>.</item>
+        /// </list></exception>
+        /// <exception cref="NotSupportedException">Thrown when the <paramref name="parentNavigationProperty"/> is read-only.</exception>
+        /// <exception cref="EntityNotFoundException">Thrown when the storageId of <paramref name="model"/> &gt; 0 and: <list type="bullet">
+        /// <item>More than one element found in <paramref name="parentNavigationProperty"/> that should have been unique.</item>
+        /// <item>No such element exists in <paramref name="parentNavigationProperty"/>.</item>
+        /// </list></exception>
+        void UpdateModel(ICollection<TEntity> parentNavigationProperty, TModel model);
+
+        /// <summary>
+        /// Updates the <paramref name="model"/> from <paramref name="entity"/>.
+        /// </summary>
+        /// <param name="entity">The <see cref="TEntity"/> to update from.</param>
+        /// <param name="model">The <see cref="TModel"/> to update.</param>
+        /// <exception cref="ArgumentNullException">Thrown when: <list type="bullet">
+        /// <item><paramref name="entity"/> is <c>null</c>.</item>
+        /// <item><paramref name="model"/> is <c>null</c>.</item>
+        /// </list></exception>
+        void ConvertEntityToModel(TEntity entity, TModel model);
+
+        /// <summary>
+        /// Updates the <paramref name="entity"/> from <paramref name="model"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="TModel"/> to update from.</param>
+        /// <param name="entity">The <see cref="TEntity"/> to update.</param>
+        /// <exception cref="ArgumentNullException">Thrown when: <list type="bullet">
+        /// <item><paramref name="model"/> is <c>null</c>.</item>
+        /// </list></exception>
+        void ConvertModelToEntity(TModel model, TEntity entity);
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs
===================================================================
diff -u -ra159e1199947de7db3ccd318cfa827d5865061a5 -r92a966a0a5ae5144b90b89be0cdf30c5eea25d7d
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision a159e1199947de7db3ccd318cfa827d5865061a5)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision 92a966a0a5ae5144b90b89be0cdf30c5eea25d7d)
@@ -22,13 +22,14 @@
 using System;
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
+using Core.Common.Base.Storage;
 
 namespace Ringtoets.HydraRing.Data
 {
     /// <summary>
     /// Location of an hydraulic boundary.
     /// </summary>
-    public class HydraulicBoundaryLocation : Observable
+    public class HydraulicBoundaryLocation : Observable, IStorable
     {
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicBoundaryLocation"/>.
@@ -74,5 +75,10 @@
         {
             return Name;
         }
+
+        /// <summary>
+        /// Gets or sets the unique identifier for the storage of the class.
+        /// </summary>
+        public long StorageId { get; set; }
     }
 }
\ No newline at end of file