Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs
===================================================================
diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r0c84eb5ded5af71c3982410db8d00ad4fcc572bd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision 0c84eb5ded5af71c3982410db8d00ad4fcc572bd)
@@ -27,6 +27,7 @@
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HydraRing.Data;
@@ -56,6 +57,7 @@
         private readonly Dictionary<HeightStructureEntity, HeightStructure> heightStructures = CreateDictionary<HeightStructureEntity, HeightStructure>();
         private readonly Dictionary<ClosingStructureEntity, ClosingStructure> closingStructures = CreateDictionary<ClosingStructureEntity, ClosingStructure>();
         private readonly Dictionary<StabilityPointStructureEntity, StabilityPointStructure> stabilityPointStructures = CreateDictionary<StabilityPointStructureEntity, StabilityPointStructure>();
+        private readonly Dictionary<HeightStructuresCalculationEntity, StructuresCalculation<HeightStructuresInput>> heightStructuresCalculations = CreateDictionary<HeightStructuresCalculationEntity, StructuresCalculation<HeightStructuresInput>>();
 
         private static Dictionary<TEntity, TModel> CreateDictionary<TEntity, TModel>()
         {
@@ -308,6 +310,20 @@
             Register(stabilityPointStructures, entity, model);
         }
 
+        /// <summary>
+        /// Registers a create operation for <paramref name="model"/> and the <paramref name="entity"/>
+        /// that was constructed with the information.
+        /// </summary>
+        /// <param name="entity">The <see cref="HeightStructuresCalculationEntity"/>
+        /// to be registered.</param>
+        /// <param name="model">The <see cref="StructuresCalculation{T}"/> to
+        /// be registered.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
+        internal void Register(HeightStructuresCalculationEntity entity, StructuresCalculation<HeightStructuresInput> model)
+        {
+            Register(heightStructuresCalculations, entity, model);
+        }
+
         #endregion
 
         #region Contains Methods
@@ -444,6 +460,17 @@
             return ContainsValue(stabilityPointStructures, model);
         }
 
+        /// <summary>
+        /// Checks whether a create operations has been registered for the given <paramref name="model"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="StructuresCalculation{T}"/> to check for.</param>
+        /// <returns><c>true</c> if the <see cref="model"/> was registered before, <c>false</c> otherwise.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
+        internal bool Contains(StructuresCalculation<HeightStructuresInput> model)
+        {
+            return ContainsValue(heightStructuresCalculations, model);
+        }
+
         #endregion
 
         #region Get Methods
@@ -649,6 +676,23 @@
             return Get(stabilityPointStructures, model);
         }
 
+        /// <summary>
+        /// Obtains the <see cref="HeightStructuresCalculationEntity"/> which was
+        /// registered for the given <paramref name="model"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="StructuresCalculation{T}"/> for
+        /// which a read operation has been registered.</param>
+        /// <returns>The constructed <see cref="HeightStructuresCalculationEntity"/>.</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(StructuresCalculation{HeightStructuresInput})"/> to find out
+        /// whether a create operation has been registered for <paramref name="model"/>.</remarks>
+        internal HeightStructuresCalculationEntity Get(StructuresCalculation<HeightStructuresInput> model)
+        {
+            return Get(heightStructuresCalculations, model);
+        }
+
         #endregion
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs
===================================================================
diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r0c84eb5ded5af71c3982410db8d00ad4fcc572bd
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision 0c84eb5ded5af71c3982410db8d00ad4fcc572bd)
@@ -29,6 +29,7 @@
 using Ringtoets.ClosingStructures.Data.TestUtil;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
@@ -649,7 +650,7 @@
             var registry = new PersistenceRegistry();
 
             // Call
-            TestDelegate call = () => registry.Contains((ClosingStructure)null);
+            TestDelegate call = () => registry.Contains((ClosingStructure) null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -710,7 +711,7 @@
             var registry = new PersistenceRegistry();
 
             // Call
-            TestDelegate call = () => registry.Contains((StabilityPointStructure)null);
+            TestDelegate call = () => registry.Contains((StabilityPointStructure) null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -764,6 +765,67 @@
             Assert.IsFalse(result);
         }
 
+        [Test]
+        public void Contains_WithoutHeightStructuresCalculation_ThrowsArgumentNullException()
+        {
+            // Setup
+            var registry = new PersistenceRegistry();
+
+            // Call
+            TestDelegate call = () => registry.Contains((StructuresCalculation<HeightStructuresInput>) null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("model", paramName);
+        }
+
+        [Test]
+        public void Contains_HeightStructuresCalculationAdded_ReturnsTrue()
+        {
+            // Setup
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
+            var registry = new PersistenceRegistry();
+            registry.Register(new HeightStructuresCalculationEntity(), calculation);
+
+            // Call
+            bool result = registry.Contains(calculation);
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void Contains_OtherHeightStructuresCalculationAdded_ReturnsFalse()
+        {
+            // Setup
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
+
+            var otherCalculation = new StructuresCalculation<HeightStructuresInput>();
+            var registry = new PersistenceRegistry();
+            registry.Register(new HeightStructuresCalculationEntity(), otherCalculation);
+
+            // Call
+            bool result = registry.Contains(calculation);
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void Contains_NoHeightStructuresCalculationAdded_ReturnsFalse()
+        {
+            // Setup
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            bool result = registry.Contains(calculation);
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+
         #endregion
 
         #region Get methods
@@ -1381,7 +1443,7 @@
             var registry = new PersistenceRegistry();
 
             // Call
-            TestDelegate call = () => registry.Get((StabilityPointStructure)null);
+            TestDelegate call = () => registry.Get((StabilityPointStructure) null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -1437,6 +1499,69 @@
             Assert.AreSame(registeredEntity, retrievedEntity);
         }
 
+        [Test]
+        public void Get_WithoutHeightStructuresCalculation_ThrowsArgumentNullException()
+        {
+            // Setup
+            var registry = new PersistenceRegistry();
+
+            // Call
+            TestDelegate call = () => registry.Get((StructuresCalculation<HeightStructuresInput>) null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("model", paramName);
+        }
+
+        [Test]
+        public void Get_NoHeightStructuresCalculationAdded_ThrowsInvalidOperationException()
+        {
+            // Setup
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
+            var registry = new PersistenceRegistry();
+
+            // Call
+            TestDelegate call = () => registry.Get(calculation);
+
+            // Assert
+            Assert.Throws<InvalidOperationException>(call);
+        }
+
+        [Test]
+        public void Get_OtherHeightStructuresCalculationAdded_ThrowsInvalidOperationException()
+        {
+            // Setup
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
+            var registeredCalculation = new StructuresCalculation<HeightStructuresInput>();
+            var registeredEntity = new HeightStructuresCalculationEntity();
+
+            var registry = new PersistenceRegistry();
+            registry.Register(registeredEntity, registeredCalculation);
+
+            // Call
+            TestDelegate call = () => registry.Get(calculation);
+
+            // Assert
+            Assert.Throws<InvalidOperationException>(call);
+        }
+
+        [Test]
+        public void Get_HeightStructuresCalculationAdded_ReturnsEntity()
+        {
+            // Setup
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
+            var registeredEntity = new HeightStructuresCalculationEntity();
+
+            var registry = new PersistenceRegistry();
+            registry.Register(registeredEntity, calculation);
+
+            // Call
+            HeightStructuresCalculationEntity retrievedEntity = registry.Get(calculation);
+
+            // Assert
+            Assert.AreSame(registeredEntity, retrievedEntity);
+        }
+
         #endregion
 
         #region Register methods
@@ -1682,7 +1807,6 @@
             Assert.AreEqual("model", paramName);
         }
 
-
         [Test]
         public void Register_WithNullStabilityPointStructure_ThrowsArgumentNullException()
         {
@@ -1697,6 +1821,20 @@
             Assert.AreEqual("model", paramName);
         }
 
+        [Test]
+        public void Register_WithNullHeightStructuresCalculation_ThrowsArgumentNullException()
+        {
+            // Setup
+            var registry = new PersistenceRegistry();
+
+            // Call
+            TestDelegate test = () => registry.Register(new HeightStructuresCalculationEntity(), null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("model", paramName);
+        }
+
         #endregion
     }
 }
\ No newline at end of file