Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -rdb6506035368f043c476a528c324f1a093759fca -r0978d02df195899fb836b7eb6f4d01f2b56f5cab
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision db6506035368f043c476a528c324f1a093759fca)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 0978d02df195899fb836b7eb6f4d01f2b56f5cab)
@@ -100,6 +100,7 @@
     <Compile Include="DbContext\ClosingStructuresSectionResultEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
+    <Compile Include="DbContext\PartialClosingStructuresOutputEntity.cs" />
     <Compile Include="DbContext\DikeProfileEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs
===================================================================
diff -u -r0c84eb5ded5af71c3982410db8d00ad4fcc572bd -r0978d02df195899fb836b7eb6f4d01f2b56f5cab
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision 0c84eb5ded5af71c3982410db8d00ad4fcc572bd)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision 0978d02df195899fb836b7eb6f4d01f2b56f5cab)
@@ -58,6 +58,7 @@
         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 readonly Dictionary<ClosingStructuresCalculationEntity, StructuresCalculation<ClosingStructuresInput>> closingStructuresCalculations = CreateDictionary<ClosingStructuresCalculationEntity, StructuresCalculation<ClosingStructuresInput>>();
 
         private static Dictionary<TEntity, TModel> CreateDictionary<TEntity, TModel>()
         {
@@ -324,6 +325,20 @@
             Register(heightStructuresCalculations, 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="ClosingStructuresCalculationEntity"/>
+        /// 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(ClosingStructuresCalculationEntity entity, StructuresCalculation<ClosingStructuresInput> model)
+        {
+            Register(closingStructuresCalculations, entity, model);
+        }
+
         #endregion
 
         #region Contains Methods
@@ -471,6 +486,17 @@
             return ContainsValue(heightStructuresCalculations, 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<ClosingStructuresInput> model)
+        {
+            return ContainsValue(closingStructuresCalculations, model);
+        }
+
         #endregion
 
         #region Get Methods
@@ -693,6 +719,23 @@
             return Get(heightStructuresCalculations, model);
         }
 
+        /// <summary>
+        /// Obtains the <see cref="ClosingStructuresCalculationEntity"/> 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="ClosingStructuresCalculationEntity"/>.</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 ClosingStructuresCalculationEntity Get(StructuresCalculation<ClosingStructuresInput> model)
+        {
+            return Get(closingStructuresCalculations, model);
+        }
+
         #endregion
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs
===================================================================
diff -u -rbce62ec6102f15b0dbb1328fd9d14063fd21c978 -r0978d02df195899fb836b7eb6f4d01f2b56f5cab
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs	(.../StructuresCalculationCreateExtensions.cs)	(revision bce62ec6102f15b0dbb1328fd9d14063fd21c978)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs	(.../StructuresCalculationCreateExtensions.cs)	(revision 0978d02df195899fb836b7eb6f4d01f2b56f5cab)
@@ -95,6 +95,13 @@
             };
             SetInputValues(entity, calculation.InputParameters, registry);
 
+            if (calculation.HasOutput)
+            {
+                entity.ClosingStructuresOutputEntities.Add(calculation.Output.Create<ClosingStructuresOutputEntity>(registry));
+            }
+
+            registry.Register(entity, calculation);
+
             return entity;
         }
 
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialClosingStructuresOutputEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialClosingStructuresOutputEntity.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialClosingStructuresOutputEntity.cs	(revision 0978d02df195899fb836b7eb6f4d01f2b56f5cab)
@@ -0,0 +1,29 @@
+// 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.
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+    /// <summary>
+    /// Partial implementation of <see cref="ClosingStructuresOutputEntity"/> that implements 
+    /// <see cref="IProbabilityAssessmentOutputEntity"/>.
+    /// </summary>
+    public partial class ClosingStructuresOutputEntity : IProbabilityAssessmentOutputEntity {}
+}
\ No newline at end of file