Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs
===================================================================
diff -u -ra760d63747f5c44e99f4e747ace1b4e51c040362 -r6a9a423fddb189769e43cc9d69d4dd828a6f68e2
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision a760d63747f5c44e99f4e747ace1b4e51c040362)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision 6a9a423fddb189769e43cc9d69d4dd828a6f68e2)
@@ -52,6 +52,7 @@
         private readonly Dictionary<FailureMechanismSectionEntity, FailureMechanismSection> failureMechanismSections = new Dictionary<FailureMechanismSectionEntity, FailureMechanismSection>();
         private readonly Dictionary<HydraulicLocationEntity, HydraulicBoundaryLocation> hydraulicLocations = new Dictionary<HydraulicLocationEntity, HydraulicBoundaryLocation>(new ReferenceEqualityComparer<HydraulicLocationEntity>());
         private readonly Dictionary<CalculationGroupEntity, CalculationGroup> calculationGroups = new Dictionary<CalculationGroupEntity, CalculationGroup>(new ReferenceEqualityComparer<CalculationGroupEntity>());
+        private readonly Dictionary<PipingCalculationEntity, PipingCalculationScenario> pipingCalculations = new Dictionary<PipingCalculationEntity, PipingCalculationScenario>(new ReferenceEqualityComparer<PipingCalculationEntity>());
         private readonly Dictionary<StochasticSoilModelEntity, StochasticSoilModel> stochasticSoilModels = new Dictionary<StochasticSoilModelEntity, StochasticSoilModel>(new ReferenceEqualityComparer<StochasticSoilModelEntity>());
         private readonly Dictionary<StochasticSoilProfileEntity, StochasticSoilProfile> stochasticSoilProfiles = new Dictionary<StochasticSoilProfileEntity, StochasticSoilProfile>(new ReferenceEqualityComparer<StochasticSoilProfileEntity>());
         private readonly Dictionary<SoilProfileEntity, PipingSoilProfile> soilProfiles = new Dictionary<SoilProfileEntity, PipingSoilProfile>(new ReferenceEqualityComparer<SoilProfileEntity>());
@@ -96,6 +97,22 @@
         /// Registers a create or update operation for <paramref name="model"/> and the
         /// <paramref name="entity"/> that was constructed with the information.
         /// </summary>
+        /// <param name="entity">The <see cref="PipingCalculationEntity"/> that was registered.</param>
+        /// <param name="model">The <see cref="PipingCalculationScenario"/> which needed to registered.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="entity"/> is <c>null</c></item>
+        /// <item><paramref name="model"/> is <c>null</c></item>
+        /// </list></exception>
+        public void Register(PipingCalculationEntity entity, PipingCalculationScenario model)
+        {
+            Register(pipingCalculations, entity, model);
+        }
+
+        /// <summary>
+        /// Registers a create or update operation for <paramref name="model"/> and the
+        /// <paramref name="entity"/> that was constructed with the information.
+        /// </summary>
         /// <param name="entity">The <see cref="ProjectEntity"/> that was registered.</param>
         /// <param name="model">The <see cref="Project"/> which needed to be registered.</param>
         /// <exception cref="ArgumentNullException">Thrown when either:
@@ -224,15 +241,97 @@
         /// Checks whether a create or update operations has been registered for the given
         /// <paramref name="model"/>.
         /// </summary>
-        /// <param name="model">The <see cref="SoilProfileEntity"/> to check for.</param>
+        /// <param name="model">The <see cref="StochasticSoilModel"/> to check for.</param>
         /// <returns><c>true</c> if the <see cref="model"/> was created before, <c>false</c> otherwise.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
+        internal bool Contains(StochasticSoilModel model)
+        {
+            return ContainsValue(stochasticSoilModels, model);
+        }
+
+        /// <summary>
+        /// Checks whether a create or update operations has been registered for the given
+        /// <paramref name="model"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="StochasticSoilProfile"/> to check for.</param>
+        /// <returns><c>true</c> if the <see cref="model"/> was created before, <c>false</c> otherwise.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
+        internal bool Contains(StochasticSoilProfile model)
+        {
+            return ContainsValue(stochasticSoilProfiles, model);
+        }
+
+        /// <summary>
+        /// Checks whether a create or update operations has been registered for the given
+        /// <paramref name="model"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="PipingSoilProfile"/> to check for.</param>
+        /// <returns><c>true</c> if the <see cref="model"/> was created before, <c>false</c> otherwise.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
         internal bool Contains(PipingSoilProfile model)
         {
             return ContainsValue(soilProfiles, model);
         }
 
         /// <summary>
+        /// Checks whether a create or update operations has been registered for the given
+        /// <paramref name="model"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="HydraulicBoundaryLocation"/> to check for.</param>
+        /// <returns><c>true</c> if the <see cref="model"/> was created before, <c>false</c> otherwise.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
+        internal bool Contains(HydraulicBoundaryLocation model)
+        {
+            return ContainsValue(hydraulicLocations, model);
+        }
+
+        /// <summary>
+        /// Checks whether a create or update operations has been registered for the given
+        /// <paramref name="model"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="RingtoetsPipingSurfaceLine"/> to check for.</param>
+        /// <returns><c>true</c> if the <see cref="model"/> was created before, <c>false</c> otherwise.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
+        internal bool Contains(RingtoetsPipingSurfaceLine model)
+        {
+            return ContainsValue(surfaceLines, model);
+        }
+
+        /// <summary>
+        /// Obtains the <see cref="StochasticSoilModelEntity"/> which was registered for
+        /// the given <paramref name="model"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="StochasticSoilModel"/> for which a read/update
+        /// operation has been registered.</param>
+        /// <returns>The created <see cref="StochasticSoilModelEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
+        /// <exception cref="InvalidOperationException">Thrown when no create operation 
+        /// has been registered for <paramref name="model"/>.</exception>
+        /// <remarks>Use <see cref="Contains(StochasticSoilModel)"/> to find out whether
+        /// a create operation has been registered for <paramref name="model"/>.</remarks>
+        internal StochasticSoilModelEntity Get(StochasticSoilModel model)
+        {
+            return Get(stochasticSoilModels, model);
+        }
+
+        /// <summary>
+        /// Obtains the <see cref="StochasticSoilProfileEntity"/> which was registered for
+        /// the given <paramref name="model"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="StochasticSoilProfile"/> for which a read/update
+        /// operation has been registered.</param>
+        /// <returns>The created <see cref="StochasticSoilProfileEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
+        /// <exception cref="InvalidOperationException">Thrown when no create operation 
+        /// has been registered for <paramref name="model"/>.</exception>
+        /// <remarks>Use <see cref="Contains(StochasticSoilProfile)"/> to find out whether
+        /// a create operation has been registered for <paramref name="model"/>.</remarks>
+        internal StochasticSoilProfileEntity Get(StochasticSoilProfile model)
+        {
+            return Get(stochasticSoilProfiles, model);
+        }
+
+        /// <summary>
         /// Obtains the <see cref="SoilProfileEntity"/> which was registered for the given
         /// <paramref name="model"/>.
         /// </summary>
@@ -241,14 +340,48 @@
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
         /// <exception cref="InvalidOperationException">Thrown when no create operation 
         /// has been registered for <paramref name="model"/>.</exception>
-        /// <remarks>Use <see cref="Contains"/> to find out whether a create operation has
+        /// <remarks>Use <see cref="Contains(PipingSoilProfile)"/> to find out whether a create operation has
         /// been registered for <paramref name="model"/>.</remarks>
         internal SoilProfileEntity Get(PipingSoilProfile model)
         {
             return Get(soilProfiles, model);
         }
 
         /// <summary>
+        /// Obtains the <see cref="SurfaceLineEntity"/> which was registered for the given
+        /// <paramref name="model"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="RingtoetsPipingSurfaceLine"/> for which a
+        /// read/update operation has been registered.</param>
+        /// <returns>The constructed <see cref="SurfaceLineEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
+        /// <exception cref="InvalidOperationException">Thrown when no create/update operation 
+        /// has been registered for <paramref name="model"/>.</exception>
+        /// <remarks>Use <see cref="Contains(RingtoetsPipingSurfaceLine)"/> to find out
+        /// whether a create/update operation has been registered for <paramref name="model"/>.</remarks>
+        internal SurfaceLineEntity Get(RingtoetsPipingSurfaceLine model)
+        {
+            return Get(surfaceLines, model);
+        }
+
+        /// <summary>
+        /// Obtains the <see cref="HydraulicLocationEntity"/> which was registered for the
+        /// given <paramref name="model"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="HydraulicBoundaryLocation"/> for which a
+        /// read/update operation has been registered.</param>
+        /// <returns>The constructed <see cref="HydraulicLocationEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
+        /// <exception cref="InvalidOperationException">Thrown when no create/update operation 
+        /// has been registered for <paramref name="model"/>.</exception>
+        /// <remarks>Use <see cref="Contains(RingtoetsPipingSurfaceLine)"/> to find out
+        /// whether a create/update operation has been registered for <paramref name="model"/>.</remarks>
+        internal HydraulicLocationEntity Get(HydraulicBoundaryLocation model)
+        {
+            return Get(hydraulicLocations, model);
+        }
+
+        /// <summary>
         /// Registers a create or update operation for <paramref name="model"/> and the
         /// <paramref name="entity"/> that was constructed with the information.
         /// </summary>
@@ -291,8 +424,6 @@
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
         /// <exception cref="InvalidOperationException">Thrown when no create operation
         /// has been registered for <paramref name="model"/>.</exception>
-        /// <remarks>Use <see cref="Contains"/> to find out whether a create or update
-        /// operation has been registered for <paramref name="model"/>.</remarks>
         internal SurfaceLinePointEntity GetSurfaceLinePoint(Point3D model)
         {
             return Get(surfaceLinePoints, model);
@@ -350,6 +481,11 @@
                 calculationGroups[entity].StorageId = entity.CalculationGroupEntityId;
             }
 
+            foreach (var entity in pipingCalculations.Keys)
+            {
+                pipingCalculations[entity].StorageId = entity.PipingCalculationEntityId;
+            }
+
             foreach (var entity in stochasticSoilModels.Keys)
             {
                 stochasticSoilModels[entity].StorageId = entity.StochasticSoilModelEntityId;
@@ -432,6 +568,13 @@
                 .Except(calculationGroups.Keys);
             calculationGroupEntities.RemoveRange(calculationGroupEntitiesToRemove);
 
+            var pipingCalculationEntities = dbContext.PipingCalculationEntities;
+            var pipingCalculationEntitiesToRemove = pipingCalculationEntities
+                .Local
+                .Where(entity => entity.PipingCalculationEntityId > 0)
+                .Except(pipingCalculations.Keys);
+            pipingCalculationEntities.RemoveRange(pipingCalculationEntitiesToRemove);
+
             var stochasticSoilModelEntities = dbContext.StochasticSoilModelEntities;
             var stochasticSoilModelEntitiesToRemove = stochasticSoilModelEntities
                 .Local