Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -rfd75ff7d1794c6a64fd3ce1aa1f159effba2e102 -rab4d75b5749af0a12698661f818e922e59125f7a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision fd75ff7d1794c6a64fd3ce1aa1f159effba2e102)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -90,6 +90,9 @@
     <Compile Include="DbContext\ClosingStructureFailureMechanismMetaEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
+    <Compile Include="DbContext\ClosingStructuresCalculationEntity.cs">
+      <DependentUpon>RingtoetsEntities.tt</DependentUpon>
+    </Compile>
     <Compile Include="DbContext\ClosingStructuresSectionResultEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
@@ -150,6 +153,9 @@
     <Compile Include="DbContext\HeightStructuresFailureMechanismMetaEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
+    <Compile Include="DbContext\HeightStructuresOutputEntity.cs">
+      <DependentUpon>RingtoetsEntities.tt</DependentUpon>
+    </Compile>
     <Compile Include="DbContext\HeightStructuresSectionResultEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs
===================================================================
diff -u -r3b154768800db81f1cf35b68248bcc53f417c90a -rab4d75b5749af0a12698661f818e922e59125f7a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs	(.../CalculationGroupEntity.cs)	(revision 3b154768800db81f1cf35b68248bcc53f417c90a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs	(.../CalculationGroupEntity.cs)	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -39,6 +39,7 @@
         public CalculationGroupEntity()
         {
             this.CalculationGroupEntity1 = new HashSet<CalculationGroupEntity>();
+            this.ClosingStructuresCalculationEntities = new HashSet<ClosingStructuresCalculationEntity>();
             this.FailureMechanismEntities = new HashSet<FailureMechanismEntity>();
             this.GrassCoverErosionInwardsCalculationEntities = new HashSet<GrassCoverErosionInwardsCalculationEntity>();
             this.GrassCoverErosionOutwardsWaveConditionsCalculationEntities = new HashSet<GrassCoverErosionOutwardsWaveConditionsCalculationEntity>();
@@ -58,6 +59,8 @@
         public virtual ICollection<CalculationGroupEntity> CalculationGroupEntity1 { get; set; }
         public virtual CalculationGroupEntity CalculationGroupEntity2 { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<ClosingStructuresCalculationEntity> ClosingStructuresCalculationEntities { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<FailureMechanismEntity> FailureMechanismEntities { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<GrassCoverErosionInwardsCalculationEntity> GrassCoverErosionInwardsCalculationEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureEntity.cs
===================================================================
diff -u -rac5da35861aeeaaab57c029d1dc7f6ed47013d25 -rab4d75b5749af0a12698661f818e922e59125f7a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureEntity.cs	(.../ClosingStructureEntity.cs)	(revision ac5da35861aeeaaab57c029d1dc7f6ed47013d25)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureEntity.cs	(.../ClosingStructureEntity.cs)	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -35,6 +35,12 @@
     
     public partial class ClosingStructureEntity
     {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public ClosingStructureEntity()
+        {
+            this.ClosingStructuresCalculationEntities = new HashSet<ClosingStructuresCalculationEntity>();
+        }
+    
         public long ClosingStructureEntityId { get; set; }
         public long FailureMechanismEntityId { get; set; }
         public int Order { get; set; }
@@ -68,5 +74,7 @@
         public byte InflowModelType { get; set; }
     
         public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<ClosingStructuresCalculationEntity> ClosingStructuresCalculationEntities { get; set; }
     }
 }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -0,0 +1,87 @@
+// 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.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class ClosingStructuresCalculationEntity
+    {
+        public long ClosingStructuresCalculationEntityId { get; set; }
+        public long CalculationGroupEntityId { get; set; }
+        public Nullable<long> ForeshoreProfileEntityId { get; set; }
+        public Nullable<long> HydraulicLocationEntityId { get; set; }
+        public Nullable<long> ClosingStructureEntityId { get; set; }
+        public int Order { get; set; }
+        public string Name { get; set; }
+        public string Comments { get; set; }
+        public byte UseBreakWater { get; set; }
+        public short BreakWaterType { get; set; }
+        public Nullable<double> BreakWaterHeight { get; set; }
+        public byte UseForeshore { get; set; }
+        public Nullable<double> Orientation { get; set; }
+        public Nullable<double> StructureNormalOrientation { get; set; }
+        public Nullable<double> StorageStructureAreaMean { get; set; }
+        public Nullable<double> StorageStructureAreaCoefficientOfVariation { get; set; }
+        public Nullable<double> AllowedLevelIncreaseStorageMean { get; set; }
+        public Nullable<double> AllowedLevelIncreaseStorageStandardDeviation { get; set; }
+        public Nullable<double> WidthFlowAperturesMean { get; set; }
+        public Nullable<double> WidthFlowAperturesCoefficientOfVariation { get; set; }
+        public Nullable<double> LevelCrestStructureNotClosingMean { get; set; }
+        public Nullable<double> LevelCrestStructureNotClosingStandardDeviation { get; set; }
+        public Nullable<double> InsideWaterLevelMean { get; set; }
+        public Nullable<double> InsideWaterLevelStandardDeviation { get; set; }
+        public Nullable<double> ThresholdHeightOpenWeirMean { get; set; }
+        public Nullable<double> ThresholdHeightOpenWeirStandardDeviation { get; set; }
+        public Nullable<double> AreaFlowAperturesMean { get; set; }
+        public Nullable<double> AreaFlowAperturesStandardDeviation { get; set; }
+        public Nullable<double> CriticalOvertoppingDischargeMean { get; set; }
+        public Nullable<double> CriticalOvertoppingDischargeCoefficientOfVariation { get; set; }
+        public Nullable<double> FlowWidthAtBottomProtectionMean { get; set; }
+        public Nullable<double> FlowWidthAtBottomProtectionStandardDeviation { get; set; }
+        public Nullable<double> ProbabilityOpenStructureBeforeFlooding { get; set; }
+        public double FailureProbabilityOpenStructure { get; set; }
+        public Nullable<double> IdenticalApertures { get; set; }
+        public double FailureProbablityReparation { get; set; }
+        public Nullable<byte> InflowModelType { get; set; }
+        public double FailureProbabilityStructureWithErosion { get; set; }
+        public Nullable<double> DeviationWaveDirection { get; set; }
+        public Nullable<double> DrainCoefficientMean { get; set; }
+        public Nullable<double> ModelFactorSuperCriticalFlowMean { get; set; }
+        public Nullable<double> StormDurationMean { get; set; }
+        public Nullable<double> FactorStormDurationOpenStructure { get; set; }
+    
+        public virtual CalculationGroupEntity CalculationGroupEntity { get; set; }
+        public virtual ClosingStructureEntity ClosingStructureEntity { get; set; }
+        public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; }
+        public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; }
+    }
+}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql
===================================================================
diff -u -r9d44bbbae4b9c8fd9c6087fb36e7cd701b5297ac -rab4d75b5749af0a12698661f818e922e59125f7a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 9d44bbbae4b9c8fd9c6087fb36e7cd701b5297ac)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 12.0 		*/
-/*  Created On : 26-okt-2016 15:46:13 				*/
+/*  Created On : 27-Oct-2016 9:12:32 AM 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -159,6 +159,9 @@
 DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsWaveConditionsOutputEntity'
 ;
 
+DROP TABLE IF EXISTS 'HeightStructuresOutputEntity'
+;
+
 DROP TABLE IF EXISTS 'HeightStructureEntity'
 ;
 
@@ -168,6 +171,9 @@
 DROP TABLE IF EXISTS 'ClosingStructureEntity'
 ;
 
+DROP TABLE IF EXISTS 'ClosingStructuresCalculationEntity'
+;
+
 DROP TABLE IF EXISTS 'StabilityPointStructureEntity'
 ;
 
@@ -461,6 +467,7 @@
 	'PipingCalculationEntityId' INTEGER NOT NULL,
 	'Order' INT (4) NOT NULL,
 	'UpliftFactorOfSafety' REAL,
+	'UpliftReliability' REAL,
 	'UpliftProbability' REAL,
 	'HeaveFactorOfSafety' REAL,
 	'HeaveReliability' REAL,
@@ -859,6 +866,20 @@
 )
 ;
 
+CREATE TABLE 'HeightStructuresOutputEntity'
+(
+	'HeightStructuresOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'HeightStructuresCalculationEntityId' INTEGER NOT NULL,
+	'RequiredProbability' REAL,
+	'RequiredReliability' REAL,
+	'Probability' REAL,
+	'Reliability' REAL,
+	'FactorOfSafety' REAL,
+	CONSTRAINT 'FK_HeightStructuresOutputEntity_HeightStructuresCalculationEntity' FOREIGN KEY ('HeightStructuresCalculationEntityId') REFERENCES 'HeightStructuresCalculationEntity' ('HeightStructuresCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade,
+	CONSTRAINT 'U_HeightStructuresCalculationEntity' UNIQUE ('HeightStructuresCalculationEntityId')
+)
+;
+
 CREATE TABLE 'HeightStructureEntity'
 (
 	'HeightStructureEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -961,6 +982,58 @@
 )
 ;
 
+CREATE TABLE 'ClosingStructuresCalculationEntity'
+(
+	'ClosingStructuresCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'CalculationGroupEntityId' INTEGER NOT NULL,
+	'ForeshoreProfileEntityId' INTEGER,
+	'HydraulicLocationEntityId' INTEGER,
+	'ClosingStructureEntityId' INTEGER,
+	'Order' INT (4) NOT NULL,
+	'Name' VARCHAR (255),
+	'Comments' TEXT,
+	'UseBreakWater' TINYINT (1) NOT NULL,
+	'BreakWaterType' SMALLINT NOT NULL,
+	'BreakWaterHeight' REAL,
+	'UseForeshore' TINYINT (1) NOT NULL,
+	'Orientation' REAL,
+	'StructureNormalOrientation' REAL,
+	'StorageStructureAreaMean' REAL,
+	'StorageStructureAreaCoefficientOfVariation' REAL,
+	'AllowedLevelIncreaseStorageMean' REAL,
+	'AllowedLevelIncreaseStorageStandardDeviation' REAL,
+	'WidthFlowAperturesMean' REAL,
+	'WidthFlowAperturesCoefficientOfVariation' REAL,
+	'LevelCrestStructureNotClosingMean' REAL,
+	'LevelCrestStructureNotClosingStandardDeviation' REAL,
+	'InsideWaterLevelMean' REAL,
+	'InsideWaterLevelStandardDeviation' REAL,
+	'ThresholdHeightOpenWeirMean' REAL,
+	'ThresholdHeightOpenWeirStandardDeviation' REAL,
+	'AreaFlowAperturesMean' REAL,
+	'AreaFlowAperturesStandardDeviation' REAL,
+	'CriticalOvertoppingDischargeMean' REAL,
+	'CriticalOvertoppingDischargeCoefficientOfVariation' REAL,
+	'FlowWidthAtBottomProtectionMean' REAL,
+	'FlowWidthAtBottomProtectionStandardDeviation' REAL,
+	'ProbabilityOpenStructureBeforeFlooding' REAL,
+	'FailureProbabilityOpenStructure' REAL NOT NULL,
+	'IdenticalApertures' REAL,
+	'FailureProbablityReparation' REAL NOT NULL,
+	'InflowModelType' TINYINT (1),
+	'FailureProbabilityStructureWithErosion' REAL NOT NULL,
+	'DeviationWaveDirection' REAL,
+	'DrainCoefficientMean' REAL,
+	'ModelFactorSuperCriticalFlowMean' REAL,
+	'StormDurationMean' REAL,
+	'FactorStormDurationOpenStructure' REAL,
+	CONSTRAINT 'FK_ClosingStructuresCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
+	CONSTRAINT 'FK_ClosingStructuresCalculationEntity_ClosingStructureEntity' FOREIGN KEY ('ClosingStructureEntityId') REFERENCES 'ClosingStructureEntity' ('ClosingStructureEntityId') ON DELETE Set Null ON UPDATE Set Null,
+	CONSTRAINT 'FK_ClosingStructuresCalculationEntity_ForeshoreProfileEntity' FOREIGN KEY ('ForeshoreProfileEntityId') REFERENCES 'ForeshoreProfileEntity' ('ForeshoreProfileEntityId') ON DELETE Set Null ON UPDATE Set Null,
+	CONSTRAINT 'FK_ClosingStructuresCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Set Null
+)
+;
+
 CREATE TABLE 'StabilityPointStructureEntity'
 (
 	'StabilityPointStructureEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -1265,6 +1338,10 @@
  ON 'GrassCoverErosionOutwardsWaveConditionsOutputEntity' ('GrassCoverErosionOutwardsWaveConditionsCalculationEntityId' ASC)
 ;
 
+CREATE INDEX 'IXFK_HeightStructuresOutputEntity_HeightStructuresCalculationEntity'
+ ON 'HeightStructuresOutputEntity' ('HeightStructuresCalculationEntityId' ASC)
+;
+
 CREATE INDEX 'IXFK_HeightStructure_FailureMechanismEntity'
  ON 'HeightStructureEntity' ('FailureMechanismEntityId' ASC)
 ;
@@ -1289,6 +1366,22 @@
  ON 'ClosingStructureEntity' ('FailureMechanismEntityId' ASC)
 ;
 
+CREATE INDEX 'IXFK_ClosingStructuresCalculationEntity_CalculationGroupEntity'
+ ON 'ClosingStructuresCalculationEntity' ('CalculationGroupEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_ClosingStructuresCalculationEntity_ClosingStructureEntity'
+ ON 'ClosingStructuresCalculationEntity' ('ClosingStructureEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_ClosingStructuresCalculationEntity_ForeshoreProfileEntity'
+ ON 'ClosingStructuresCalculationEntity' ('ForeshoreProfileEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_ClosingStructuresCalculationEntity_HydraulicLocationEntity'
+ ON 'ClosingStructuresCalculationEntity' ('HydraulicLocationEntityId' ASC)
+;
+
 CREATE INDEX 'IXFK_StabilityPointStructureEntity_FailureMechanismEntity'
  ON 'StabilityPointStructureEntity' ('FailureMechanismEntityId' ASC)
 ;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ForeshoreProfileEntity.cs
===================================================================
diff -u -r3b154768800db81f1cf35b68248bcc53f417c90a -rab4d75b5749af0a12698661f818e922e59125f7a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ForeshoreProfileEntity.cs	(.../ForeshoreProfileEntity.cs)	(revision 3b154768800db81f1cf35b68248bcc53f417c90a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ForeshoreProfileEntity.cs	(.../ForeshoreProfileEntity.cs)	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -38,6 +38,7 @@
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public ForeshoreProfileEntity()
         {
+            this.ClosingStructuresCalculationEntities = new HashSet<ClosingStructuresCalculationEntity>();
             this.GrassCoverErosionOutwardsWaveConditionsCalculationEntities = new HashSet<GrassCoverErosionOutwardsWaveConditionsCalculationEntity>();
             this.HeightStructuresCalculationEntities = new HashSet<HeightStructuresCalculationEntity>();
             this.StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet<StabilityStoneCoverWaveConditionsCalculationEntity>();
@@ -56,6 +57,8 @@
         public Nullable<double> X0 { get; set; }
         public int Order { get; set; }
     
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<ClosingStructuresCalculationEntity> ClosingStructuresCalculationEntities { get; set; }
         public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<GrassCoverErosionOutwardsWaveConditionsCalculationEntity> GrassCoverErosionOutwardsWaveConditionsCalculationEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs
===================================================================
diff -u -r50e7c9ffa6c528abd1a1ee61784f78d5983465fe -rab4d75b5749af0a12698661f818e922e59125f7a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs	(.../HeightStructuresCalculationEntity.cs)	(revision 50e7c9ffa6c528abd1a1ee61784f78d5983465fe)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs	(.../HeightStructuresCalculationEntity.cs)	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -35,6 +35,12 @@
     
     public partial class HeightStructuresCalculationEntity
     {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public HeightStructuresCalculationEntity()
+        {
+            this.HeightStructuresOutputEntities = new HashSet<HeightStructuresOutputEntity>();
+        }
+    
         public long HeightStructuresCalculationEntityId { get; set; }
         public long CalculationGroupEntityId { get; set; }
         public Nullable<long> HydraulicLocationEntityId { get; set; }
@@ -69,5 +75,7 @@
         public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; }
         public virtual HeightStructureEntity HeightStructureEntity { get; set; }
         public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<HeightStructuresOutputEntity> HeightStructuresOutputEntities { get; set; }
     }
 }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -0,0 +1,48 @@
+// 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.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class HeightStructuresOutputEntity
+    {
+        public long HeightStructuresOutputEntityId { get; set; }
+        public long HeightStructuresCalculationEntityId { get; set; }
+        public Nullable<double> RequiredProbability { get; set; }
+        public Nullable<double> RequiredReliability { get; set; }
+        public Nullable<double> Probability { get; set; }
+        public Nullable<double> Reliability { get; set; }
+        public Nullable<double> FactorOfSafety { get; set; }
+    
+        public virtual HeightStructuresCalculationEntity HeightStructuresCalculationEntity { get; set; }
+    }
+}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs
===================================================================
diff -u -r3b154768800db81f1cf35b68248bcc53f417c90a -rab4d75b5749af0a12698661f818e922e59125f7a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs	(.../HydraulicLocationEntity.cs)	(revision 3b154768800db81f1cf35b68248bcc53f417c90a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs	(.../HydraulicLocationEntity.cs)	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -38,6 +38,7 @@
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public HydraulicLocationEntity()
         {
+            this.ClosingStructuresCalculationEntities = new HashSet<ClosingStructuresCalculationEntity>();
             this.GrassCoverErosionInwardsCalculationEntities = new HashSet<GrassCoverErosionInwardsCalculationEntity>();
             this.HeightStructuresCalculationEntities = new HashSet<HeightStructuresCalculationEntity>();
             this.PipingCalculationEntities = new HashSet<PipingCalculationEntity>();
@@ -59,6 +60,8 @@
     
         public virtual AssessmentSectionEntity AssessmentSectionEntity { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<ClosingStructuresCalculationEntity> ClosingStructuresCalculationEntities { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<GrassCoverErosionInwardsCalculationEntity> GrassCoverErosionInwardsCalculationEntities { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<HeightStructuresCalculationEntity> HeightStructuresCalculationEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs
===================================================================
diff -u -rdceba6b3e14e5a6da00dfb14cb90e2e1961257f2 -rab4d75b5749af0a12698661f818e922e59125f7a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs	(.../PipingSemiProbabilisticOutputEntity.cs)	(revision dceba6b3e14e5a6da00dfb14cb90e2e1961257f2)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs	(.../PipingSemiProbabilisticOutputEntity.cs)	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -39,6 +39,7 @@
         public long PipingCalculationEntityId { get; set; }
         public int Order { get; set; }
         public Nullable<double> UpliftFactorOfSafety { get; set; }
+        public Nullable<double> UpliftReliability { get; set; }
         public Nullable<double> UpliftProbability { get; set; }
         public Nullable<double> HeaveFactorOfSafety { get; set; }
         public Nullable<double> HeaveReliability { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs
===================================================================
diff -u -r749f4e50391ac399e02cb497966ae7d749d5fd1e -rab4d75b5749af0a12698661f818e922e59125f7a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs	(.../RingtoetsEntities.Context.cs)	(revision 749f4e50391ac399e02cb497966ae7d749d5fd1e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs	(.../RingtoetsEntities.Context.cs)	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -57,6 +57,7 @@
         public virtual DbSet<CharacteristicPointEntity> CharacteristicPointEntities { get; set; }
         public virtual DbSet<ClosingStructureEntity> ClosingStructureEntities { get; set; }
         public virtual DbSet<ClosingStructureFailureMechanismMetaEntity> ClosingStructureFailureMechanismMetaEntities { get; set; }
+        public virtual DbSet<ClosingStructuresCalculationEntity> ClosingStructuresCalculationEntities { get; set; }
         public virtual DbSet<ClosingStructuresSectionResultEntity> ClosingStructuresSectionResultEntities { get; set; }
         public virtual DbSet<DikeProfileEntity> DikeProfileEntities { get; set; }
         public virtual DbSet<DuneErosionSectionResultEntity> DuneErosionSectionResultEntities { get; set; }
@@ -77,6 +78,7 @@
         public virtual DbSet<HeightStructureEntity> HeightStructureEntities { get; set; }
         public virtual DbSet<HeightStructuresCalculationEntity> HeightStructuresCalculationEntities { get; set; }
         public virtual DbSet<HeightStructuresFailureMechanismMetaEntity> HeightStructuresFailureMechanismMetaEntities { get; set; }
+        public virtual DbSet<HeightStructuresOutputEntity> HeightStructuresOutputEntities { get; set; }
         public virtual DbSet<HeightStructuresSectionResultEntity> HeightStructuresSectionResultEntities { get; set; }
         public virtual DbSet<HydraulicLocationEntity> HydraulicLocationEntities { get; set; }
         public virtual DbSet<MacrostabilityInwardsSectionResultEntity> MacrostabilityInwardsSectionResultEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs
===================================================================
diff -u -r9d44bbbae4b9c8fd9c6087fb36e7cd701b5297ac -rab4d75b5749af0a12698661f818e922e59125f7a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs	(.../RingtoetsEntities.Designer.cs)	(revision 9d44bbbae4b9c8fd9c6087fb36e7cd701b5297ac)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs	(.../RingtoetsEntities.Designer.cs)	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -1,4 +1,4 @@
-// T4 code generation is enabled for model 'D:\Clean_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. 
+// T4 code generation is enabled for model 'D:\Projects\WTI\trunk\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. 
 // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
 // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
 // is open in the designer.
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -r9d44bbbae4b9c8fd9c6087fb36e7cd701b5297ac -rab4d75b5749af0a12698661f818e922e59125f7a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx	(.../RingtoetsEntities.edmx)	(revision 9d44bbbae4b9c8fd9c6087fb36e7cd701b5297ac)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx	(.../RingtoetsEntities.edmx)	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -4,7 +4,7 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-    <Schema Namespace="RingtoetsEntitiesModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="data source=D:\Clean_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\Ringtoets.rtd" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+    <Schema Namespace="RingtoetsEntitiesModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="data source=D:\Projects\WTI\trunk\Application\Ringtoets\src\Application.Ringtoets.Storage\Ringtoets.rtd" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="AssessmentSectionEntity">
           <Key>
             <PropertyRef Name="AssessmentSectionEntityId" />
@@ -86,6 +86,54 @@
           <Property Name="FailureMechanismEntityId" Type="integer" Nullable="false" />
           <Property Name="N2A" Type="int" Nullable="false" />
         </EntityType>
+        <EntityType Name="ClosingStructuresCalculationEntity">
+          <Key>
+            <PropertyRef Name="ClosingStructuresCalculationEntityId" />
+          </Key>
+          <Property Name="ClosingStructuresCalculationEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="CalculationGroupEntityId" Type="integer" Nullable="false" />
+          <Property Name="ForeshoreProfileEntityId" Type="integer" />
+          <Property Name="HydraulicLocationEntityId" Type="integer" />
+          <Property Name="ClosingStructureEntityId" Type="integer" />
+          <Property Name="Order" Type="int" Nullable="false" />
+          <Property Name="Name" Type="varchar" MaxLength="255" />
+          <Property Name="Comments" Type="nvarchar" MaxLength="2147483647" />
+          <Property Name="UseBreakWater" Type="tinyint" Nullable="false" />
+          <Property Name="BreakWaterType" Type="smallint" Nullable="false" />
+          <Property Name="BreakWaterHeight" Type="real" />
+          <Property Name="UseForeshore" Type="tinyint" Nullable="false" />
+          <Property Name="Orientation" Type="real" />
+          <Property Name="StructureNormalOrientation" Type="real" />
+          <Property Name="StorageStructureAreaMean" Type="real" />
+          <Property Name="StorageStructureAreaCoefficientOfVariation" Type="real" />
+          <Property Name="AllowedLevelIncreaseStorageMean" Type="real" />
+          <Property Name="AllowedLevelIncreaseStorageStandardDeviation" Type="real" />
+          <Property Name="WidthFlowAperturesMean" Type="real" />
+          <Property Name="WidthFlowAperturesCoefficientOfVariation" Type="real" />
+          <Property Name="LevelCrestStructureNotClosingMean" Type="real" />
+          <Property Name="LevelCrestStructureNotClosingStandardDeviation" Type="real" />
+          <Property Name="InsideWaterLevelMean" Type="real" />
+          <Property Name="InsideWaterLevelStandardDeviation" Type="real" />
+          <Property Name="ThresholdHeightOpenWeirMean" Type="real" />
+          <Property Name="ThresholdHeightOpenWeirStandardDeviation" Type="real" />
+          <Property Name="AreaFlowAperturesMean" Type="real" />
+          <Property Name="AreaFlowAperturesStandardDeviation" Type="real" />
+          <Property Name="CriticalOvertoppingDischargeMean" Type="real" />
+          <Property Name="CriticalOvertoppingDischargeCoefficientOfVariation" Type="real" />
+          <Property Name="FlowWidthAtBottomProtectionMean" Type="real" />
+          <Property Name="FlowWidthAtBottomProtectionStandardDeviation" Type="real" />
+          <Property Name="ProbabilityOpenStructureBeforeFlooding" Type="real" />
+          <Property Name="FailureProbabilityOpenStructure" Type="real" Nullable="false" />
+          <Property Name="IdenticalApertures" Type="real" />
+          <Property Name="FailureProbablityReparation" Type="real" Nullable="false" />
+          <Property Name="InflowModelType" Type="tinyint" />
+          <Property Name="FailureProbabilityStructureWithErosion" Type="real" Nullable="false" />
+          <Property Name="DeviationWaveDirection" Type="real" />
+          <Property Name="DrainCoefficientMean" Type="real" />
+          <Property Name="ModelFactorSuperCriticalFlowMean" Type="real" />
+          <Property Name="StormDurationMean" Type="real" />
+          <Property Name="FactorStormDurationOpenStructure" Type="real" />
+        </EntityType>
         <EntityType Name="ClosingStructuresSectionResultEntity">
           <Key>
             <PropertyRef Name="ClosingStructuresSectionResultEntityId" />
@@ -372,6 +420,18 @@
           <Property Name="FailureMechanismEntityId" Type="integer" Nullable="false" />
           <Property Name="N" Type="int" Nullable="false" />
         </EntityType>
+        <EntityType Name="HeightStructuresOutputEntity">
+          <Key>
+            <PropertyRef Name="HeightStructuresOutputEntityId" />
+          </Key>
+          <Property Name="HeightStructuresOutputEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="HeightStructuresCalculationEntityId" Type="integer" Nullable="false" />
+          <Property Name="RequiredProbability" Type="real" />
+          <Property Name="RequiredReliability" Type="real" />
+          <Property Name="Probability" Type="real" />
+          <Property Name="Reliability" Type="real" />
+          <Property Name="FactorOfSafety" Type="real" />
+        </EntityType>
         <EntityType Name="HeightStructuresSectionResultEntity">
           <Key>
             <PropertyRef Name="HeightStructuresSectionResultEntityId" />
@@ -488,6 +548,7 @@
           <Property Name="PipingCalculationEntityId" Type="integer" Nullable="false" />
           <Property Name="Order" Type="int" Nullable="false" />
           <Property Name="UpliftFactorOfSafety" Type="real" />
+          <Property Name="UpliftReliability" Type="real" />
           <Property Name="UpliftProbability" Type="real" />
           <Property Name="HeaveFactorOfSafety" Type="real" />
           <Property Name="HeaveReliability" Type="real" />
@@ -838,6 +899,54 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_ClosingStructuresCalculationEntity_0_0">
+          <End Role="HydraulicLocationEntity" Type="Self.HydraulicLocationEntity" Multiplicity="0..1" />
+          <End Role="ClosingStructuresCalculationEntity" Type="Self.ClosingStructuresCalculationEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="HydraulicLocationEntity">
+              <PropertyRef Name="HydraulicLocationEntityId" />
+            </Principal>
+            <Dependent Role="ClosingStructuresCalculationEntity">
+              <PropertyRef Name="HydraulicLocationEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_ClosingStructuresCalculationEntity_1_0">
+          <End Role="ForeshoreProfileEntity" Type="Self.ForeshoreProfileEntity" Multiplicity="0..1" />
+          <End Role="ClosingStructuresCalculationEntity" Type="Self.ClosingStructuresCalculationEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="ForeshoreProfileEntity">
+              <PropertyRef Name="ForeshoreProfileEntityId" />
+            </Principal>
+            <Dependent Role="ClosingStructuresCalculationEntity">
+              <PropertyRef Name="ForeshoreProfileEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_ClosingStructuresCalculationEntity_2_0">
+          <End Role="ClosingStructureEntity" Type="Self.ClosingStructureEntity" Multiplicity="0..1" />
+          <End Role="ClosingStructuresCalculationEntity" Type="Self.ClosingStructuresCalculationEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="ClosingStructureEntity">
+              <PropertyRef Name="ClosingStructureEntityId" />
+            </Principal>
+            <Dependent Role="ClosingStructuresCalculationEntity">
+              <PropertyRef Name="ClosingStructureEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_ClosingStructuresCalculationEntity_3_0">
+          <End Role="CalculationGroupEntity" Type="Self.CalculationGroupEntity" Multiplicity="1" />
+          <End Role="ClosingStructuresCalculationEntity" Type="Self.ClosingStructuresCalculationEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="CalculationGroupEntity">
+              <PropertyRef Name="CalculationGroupEntityId" />
+            </Principal>
+            <Dependent Role="ClosingStructuresCalculationEntity">
+              <PropertyRef Name="CalculationGroupEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_ClosingStructuresSectionResultEntity_0_0">
           <End Role="FailureMechanismSectionEntity" Type="Self.FailureMechanismSectionEntity" Multiplicity="1" />
           <End Role="ClosingStructuresSectionResultEntity" Type="Self.ClosingStructuresSectionResultEntity" Multiplicity="*" />
@@ -1186,6 +1295,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_HeightStructuresOutputEntity_0_0">
+          <End Role="HeightStructuresCalculationEntity" Type="Self.HeightStructuresCalculationEntity" Multiplicity="1" />
+          <End Role="HeightStructuresOutputEntity" Type="Self.HeightStructuresOutputEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="HeightStructuresCalculationEntity">
+              <PropertyRef Name="HeightStructuresCalculationEntityId" />
+            </Principal>
+            <Dependent Role="HeightStructuresOutputEntity">
+              <PropertyRef Name="HeightStructuresCalculationEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_HeightStructuresSectionResultEntity_0_0">
           <End Role="FailureMechanismSectionEntity" Type="Self.FailureMechanismSectionEntity" Multiplicity="1" />
           <End Role="HeightStructuresSectionResultEntity" Type="Self.HeightStructuresSectionResultEntity" Multiplicity="*" />
@@ -1612,6 +1733,7 @@
           <EntitySet Name="CharacteristicPointEntity" EntityType="Self.CharacteristicPointEntity" store:Type="Tables" />
           <EntitySet Name="ClosingStructureEntity" EntityType="Self.ClosingStructureEntity" store:Type="Tables" />
           <EntitySet Name="ClosingStructureFailureMechanismMetaEntity" EntityType="Self.ClosingStructureFailureMechanismMetaEntity" store:Type="Tables" />
+          <EntitySet Name="ClosingStructuresCalculationEntity" EntityType="Self.ClosingStructuresCalculationEntity" store:Type="Tables" />
           <EntitySet Name="ClosingStructuresSectionResultEntity" EntityType="Self.ClosingStructuresSectionResultEntity" store:Type="Tables" />
           <EntitySet Name="DikeProfileEntity" EntityType="Self.DikeProfileEntity" store:Type="Tables" />
           <EntitySet Name="DuneErosionSectionResultEntity" EntityType="Self.DuneErosionSectionResultEntity" store:Type="Tables" />
@@ -1632,6 +1754,7 @@
           <EntitySet Name="HeightStructureEntity" EntityType="Self.HeightStructureEntity" store:Type="Tables" />
           <EntitySet Name="HeightStructuresCalculationEntity" EntityType="Self.HeightStructuresCalculationEntity" store:Type="Tables" />
           <EntitySet Name="HeightStructuresFailureMechanismMetaEntity" EntityType="Self.HeightStructuresFailureMechanismMetaEntity" store:Type="Tables" />
+          <EntitySet Name="HeightStructuresOutputEntity" EntityType="Self.HeightStructuresOutputEntity" store:Type="Tables" />
           <EntitySet Name="HeightStructuresSectionResultEntity" EntityType="Self.HeightStructuresSectionResultEntity" store:Type="Tables" />
           <EntitySet Name="HydraulicLocationEntity" EntityType="Self.HydraulicLocationEntity" store:Type="Tables" />
           <EntitySet Name="MacrostabilityInwardsSectionResultEntity" EntityType="Self.MacrostabilityInwardsSectionResultEntity" store:Type="Tables" />
@@ -1682,6 +1805,22 @@
             <End Role="FailureMechanismEntity" EntitySet="FailureMechanismEntity" />
             <End Role="ClosingStructureFailureMechanismMetaEntity" EntitySet="ClosingStructureFailureMechanismMetaEntity" />
           </AssociationSet>
+          <AssociationSet Name="FK_ClosingStructuresCalculationEntity_0_0" Association="Self.FK_ClosingStructuresCalculationEntity_0_0">
+            <End Role="HydraulicLocationEntity" EntitySet="HydraulicLocationEntity" />
+            <End Role="ClosingStructuresCalculationEntity" EntitySet="ClosingStructuresCalculationEntity" />
+          </AssociationSet>
+          <AssociationSet Name="FK_ClosingStructuresCalculationEntity_1_0" Association="Self.FK_ClosingStructuresCalculationEntity_1_0">
+            <End Role="ForeshoreProfileEntity" EntitySet="ForeshoreProfileEntity" />
+            <End Role="ClosingStructuresCalculationEntity" EntitySet="ClosingStructuresCalculationEntity" />
+          </AssociationSet>
+          <AssociationSet Name="FK_ClosingStructuresCalculationEntity_2_0" Association="Self.FK_ClosingStructuresCalculationEntity_2_0">
+            <End Role="ClosingStructureEntity" EntitySet="ClosingStructureEntity" />
+            <End Role="ClosingStructuresCalculationEntity" EntitySet="ClosingStructuresCalculationEntity" />
+          </AssociationSet>
+          <AssociationSet Name="FK_ClosingStructuresCalculationEntity_3_0" Association="Self.FK_ClosingStructuresCalculationEntity_3_0">
+            <End Role="CalculationGroupEntity" EntitySet="CalculationGroupEntity" />
+            <End Role="ClosingStructuresCalculationEntity" EntitySet="ClosingStructuresCalculationEntity" />
+          </AssociationSet>
           <AssociationSet Name="FK_ClosingStructuresSectionResultEntity_0_0" Association="Self.FK_ClosingStructuresSectionResultEntity_0_0">
             <End Role="FailureMechanismSectionEntity" EntitySet="FailureMechanismSectionEntity" />
             <End Role="ClosingStructuresSectionResultEntity" EntitySet="ClosingStructuresSectionResultEntity" />
@@ -1798,6 +1937,10 @@
             <End Role="FailureMechanismEntity" EntitySet="FailureMechanismEntity" />
             <End Role="HeightStructuresFailureMechanismMetaEntity" EntitySet="HeightStructuresFailureMechanismMetaEntity" />
           </AssociationSet>
+          <AssociationSet Name="FK_HeightStructuresOutputEntity_0_0" Association="Self.FK_HeightStructuresOutputEntity_0_0">
+            <End Role="HeightStructuresCalculationEntity" EntitySet="HeightStructuresCalculationEntity" />
+            <End Role="HeightStructuresOutputEntity" EntitySet="HeightStructuresOutputEntity" />
+          </AssociationSet>
           <AssociationSet Name="FK_HeightStructuresSectionResultEntity_0_0" Association="Self.FK_HeightStructuresSectionResultEntity_0_0">
             <End Role="FailureMechanismSectionEntity" EntitySet="FailureMechanismSectionEntity" />
             <End Role="HeightStructuresSectionResultEntity" EntitySet="HeightStructuresSectionResultEntity" />
@@ -1949,6 +2092,7 @@
           <EntitySet Name="CharacteristicPointEntities" EntityType="RingtoetsEntitiesModel.CharacteristicPointEntity" />
           <EntitySet Name="ClosingStructureEntities" EntityType="RingtoetsEntitiesModel.ClosingStructureEntity" />
           <EntitySet Name="ClosingStructureFailureMechanismMetaEntities" EntityType="RingtoetsEntitiesModel.ClosingStructureFailureMechanismMetaEntity" />
+          <EntitySet Name="ClosingStructuresCalculationEntities" EntityType="RingtoetsEntitiesModel.ClosingStructuresCalculationEntity" />
           <EntitySet Name="ClosingStructuresSectionResultEntities" EntityType="RingtoetsEntitiesModel.ClosingStructuresSectionResultEntity" />
           <EntitySet Name="DikeProfileEntities" EntityType="RingtoetsEntitiesModel.DikeProfileEntity" />
           <EntitySet Name="DuneErosionSectionResultEntities" EntityType="RingtoetsEntitiesModel.DuneErosionSectionResultEntity" />
@@ -1969,6 +2113,7 @@
           <EntitySet Name="HeightStructureEntities" EntityType="RingtoetsEntitiesModel.HeightStructureEntity" />
           <EntitySet Name="HeightStructuresCalculationEntities" EntityType="RingtoetsEntitiesModel.HeightStructuresCalculationEntity" />
           <EntitySet Name="HeightStructuresFailureMechanismMetaEntities" EntityType="RingtoetsEntitiesModel.HeightStructuresFailureMechanismMetaEntity" />
+          <EntitySet Name="HeightStructuresOutputEntities" EntityType="RingtoetsEntitiesModel.HeightStructuresOutputEntity" />
           <EntitySet Name="HeightStructuresSectionResultEntities" EntityType="RingtoetsEntitiesModel.HeightStructuresSectionResultEntity" />
           <EntitySet Name="HydraulicLocationEntities" EntityType="RingtoetsEntitiesModel.HydraulicLocationEntity" />
           <EntitySet Name="MacrostabilityInwardsSectionResultEntities" EntityType="RingtoetsEntitiesModel.MacrostabilityInwardsSectionResultEntity" />
@@ -2015,6 +2160,10 @@
             <End Role="CalculationGroupEntity" EntitySet="CalculationGroupEntities" />
             <End Role="CalculationGroupEntity1" EntitySet="CalculationGroupEntities" />
           </AssociationSet>
+          <AssociationSet Name="FK_ClosingStructuresCalculationEntity_3_0" Association="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_3_0">
+            <End Role="CalculationGroupEntity" EntitySet="CalculationGroupEntities" />
+            <End Role="ClosingStructuresCalculationEntity" EntitySet="ClosingStructuresCalculationEntities" />
+          </AssociationSet>
           <AssociationSet Name="FK_FailureMechanismEntity_0_0" Association="RingtoetsEntitiesModel.FK_FailureMechanismEntity_0_0">
             <End Role="CalculationGroupEntity" EntitySet="CalculationGroupEntities" />
             <End Role="FailureMechanismEntity" EntitySet="FailureMechanismEntities" />
@@ -2051,10 +2200,22 @@
             <End Role="FailureMechanismEntity" EntitySet="FailureMechanismEntities" />
             <End Role="ClosingStructureEntity" EntitySet="ClosingStructureEntities" />
           </AssociationSet>
+          <AssociationSet Name="FK_ClosingStructuresCalculationEntity_2_0" Association="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_2_0">
+            <End Role="ClosingStructureEntity" EntitySet="ClosingStructureEntities" />
+            <End Role="ClosingStructuresCalculationEntity" EntitySet="ClosingStructuresCalculationEntities" />
+          </AssociationSet>
           <AssociationSet Name="FK_ClosingStructureFailureMechanismMetaEntity_0_0" Association="RingtoetsEntitiesModel.FK_ClosingStructureFailureMechanismMetaEntity_0_0">
             <End Role="FailureMechanismEntity" EntitySet="FailureMechanismEntities" />
             <End Role="ClosingStructureFailureMechanismMetaEntity" EntitySet="ClosingStructureFailureMechanismMetaEntities" />
           </AssociationSet>
+          <AssociationSet Name="FK_ClosingStructuresCalculationEntity_0_0" Association="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_0_0">
+            <End Role="HydraulicLocationEntity" EntitySet="HydraulicLocationEntities" />
+            <End Role="ClosingStructuresCalculationEntity" EntitySet="ClosingStructuresCalculationEntities" />
+          </AssociationSet>
+          <AssociationSet Name="FK_ClosingStructuresCalculationEntity_1_0" Association="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_1_0">
+            <End Role="ForeshoreProfileEntity" EntitySet="ForeshoreProfileEntities" />
+            <End Role="ClosingStructuresCalculationEntity" EntitySet="ClosingStructuresCalculationEntities" />
+          </AssociationSet>
           <AssociationSet Name="FK_ClosingStructuresSectionResultEntity_0_0" Association="RingtoetsEntitiesModel.FK_ClosingStructuresSectionResultEntity_0_0">
             <End Role="FailureMechanismSectionEntity" EntitySet="FailureMechanismSectionEntities" />
             <End Role="ClosingStructuresSectionResultEntity" EntitySet="ClosingStructuresSectionResultEntities" />
@@ -2227,6 +2388,10 @@
             <End Role="HydraulicLocationEntity" EntitySet="HydraulicLocationEntities" />
             <End Role="HeightStructuresCalculationEntity" EntitySet="HeightStructuresCalculationEntities" />
           </AssociationSet>
+          <AssociationSet Name="FK_HeightStructuresOutputEntity_0_0" Association="RingtoetsEntitiesModel.FK_HeightStructuresOutputEntity_0_0">
+            <End Role="HeightStructuresCalculationEntity" EntitySet="HeightStructuresCalculationEntities" />
+            <End Role="HeightStructuresOutputEntity" EntitySet="HeightStructuresOutputEntities" />
+          </AssociationSet>
           <AssociationSet Name="FK_PipingCalculationEntity_2_0" Association="RingtoetsEntitiesModel.FK_PipingCalculationEntity_2_0">
             <End Role="HydraulicLocationEntity" EntitySet="HydraulicLocationEntities" />
             <End Role="PipingCalculationEntity" EntitySet="PipingCalculationEntities" />
@@ -2306,6 +2471,7 @@
           <Property Name="Order" Type="Int32" Nullable="false" />
           <NavigationProperty Name="CalculationGroupEntity1" Relationship="RingtoetsEntitiesModel.FK_CalculationGroupEntity_0_0" FromRole="CalculationGroupEntity" ToRole="CalculationGroupEntity1" />
           <NavigationProperty Name="CalculationGroupEntity2" Relationship="RingtoetsEntitiesModel.FK_CalculationGroupEntity_0_0" FromRole="CalculationGroupEntity1" ToRole="CalculationGroupEntity" />
+          <NavigationProperty Name="ClosingStructuresCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_3_0" FromRole="CalculationGroupEntity" ToRole="ClosingStructuresCalculationEntity" />
           <NavigationProperty Name="FailureMechanismEntities" Relationship="RingtoetsEntitiesModel.FK_FailureMechanismEntity_0_0" FromRole="CalculationGroupEntity" ToRole="FailureMechanismEntity" />
           <NavigationProperty Name="GrassCoverErosionInwardsCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_GrassCoverErosionInwardsCalculationEntity_2_0" FromRole="CalculationGroupEntity" ToRole="GrassCoverErosionInwardsCalculationEntity" />
           <NavigationProperty Name="GrassCoverErosionOutwardsWaveConditionsCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_2_0" FromRole="CalculationGroupEntity" ToRole="GrassCoverErosionOutwardsWaveConditionsCalculationEntity" />
@@ -2362,6 +2528,7 @@
           <Property Name="FailureProbabilityReparation" Type="Double" />
           <Property Name="InflowModelType" Type="Byte" Nullable="false" />
           <NavigationProperty Name="FailureMechanismEntity" Relationship="RingtoetsEntitiesModel.FK_ClosingStructureEntity_0_0" FromRole="ClosingStructureEntity" ToRole="FailureMechanismEntity" />
+          <NavigationProperty Name="ClosingStructuresCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_2_0" FromRole="ClosingStructureEntity" ToRole="ClosingStructuresCalculationEntity" />
         </EntityType>
         <EntityType Name="ClosingStructureFailureMechanismMetaEntity">
           <Key>
@@ -2372,6 +2539,58 @@
           <Property Name="N2A" Type="Int32" Nullable="false" />
           <NavigationProperty Name="FailureMechanismEntity" Relationship="RingtoetsEntitiesModel.FK_ClosingStructureFailureMechanismMetaEntity_0_0" FromRole="ClosingStructureFailureMechanismMetaEntity" ToRole="FailureMechanismEntity" />
         </EntityType>
+        <EntityType Name="ClosingStructuresCalculationEntity">
+          <Key>
+            <PropertyRef Name="ClosingStructuresCalculationEntityId" />
+          </Key>
+          <Property Name="ClosingStructuresCalculationEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="CalculationGroupEntityId" Type="Int64" Nullable="false" />
+          <Property Name="ForeshoreProfileEntityId" Type="Int64" />
+          <Property Name="HydraulicLocationEntityId" Type="Int64" />
+          <Property Name="ClosingStructureEntityId" Type="Int64" />
+          <Property Name="Order" Type="Int32" Nullable="false" />
+          <Property Name="Name" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
+          <Property Name="Comments" Type="String" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="UseBreakWater" Type="Byte" Nullable="false" />
+          <Property Name="BreakWaterType" Type="Int16" Nullable="false" />
+          <Property Name="BreakWaterHeight" Type="Double" />
+          <Property Name="UseForeshore" Type="Byte" Nullable="false" />
+          <Property Name="Orientation" Type="Double" />
+          <Property Name="StructureNormalOrientation" Type="Double" />
+          <Property Name="StorageStructureAreaMean" Type="Double" />
+          <Property Name="StorageStructureAreaCoefficientOfVariation" Type="Double" />
+          <Property Name="AllowedLevelIncreaseStorageMean" Type="Double" />
+          <Property Name="AllowedLevelIncreaseStorageStandardDeviation" Type="Double" />
+          <Property Name="WidthFlowAperturesMean" Type="Double" />
+          <Property Name="WidthFlowAperturesCoefficientOfVariation" Type="Double" />
+          <Property Name="LevelCrestStructureNotClosingMean" Type="Double" />
+          <Property Name="LevelCrestStructureNotClosingStandardDeviation" Type="Double" />
+          <Property Name="InsideWaterLevelMean" Type="Double" />
+          <Property Name="InsideWaterLevelStandardDeviation" Type="Double" />
+          <Property Name="ThresholdHeightOpenWeirMean" Type="Double" />
+          <Property Name="ThresholdHeightOpenWeirStandardDeviation" Type="Double" />
+          <Property Name="AreaFlowAperturesMean" Type="Double" />
+          <Property Name="AreaFlowAperturesStandardDeviation" Type="Double" />
+          <Property Name="CriticalOvertoppingDischargeMean" Type="Double" />
+          <Property Name="CriticalOvertoppingDischargeCoefficientOfVariation" Type="Double" />
+          <Property Name="FlowWidthAtBottomProtectionMean" Type="Double" />
+          <Property Name="FlowWidthAtBottomProtectionStandardDeviation" Type="Double" />
+          <Property Name="ProbabilityOpenStructureBeforeFlooding" Type="Double" />
+          <Property Name="FailureProbabilityOpenStructure" Type="Double" Nullable="false" />
+          <Property Name="IdenticalApertures" Type="Double" />
+          <Property Name="FailureProbablityReparation" Type="Double" Nullable="false" />
+          <Property Name="InflowModelType" Type="Byte" />
+          <Property Name="FailureProbabilityStructureWithErosion" Type="Double" Nullable="false" />
+          <Property Name="DeviationWaveDirection" Type="Double" />
+          <Property Name="DrainCoefficientMean" Type="Double" />
+          <Property Name="ModelFactorSuperCriticalFlowMean" Type="Double" />
+          <Property Name="StormDurationMean" Type="Double" />
+          <Property Name="FactorStormDurationOpenStructure" Type="Double" />
+          <NavigationProperty Name="CalculationGroupEntity" Relationship="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_3_0" FromRole="ClosingStructuresCalculationEntity" ToRole="CalculationGroupEntity" />
+          <NavigationProperty Name="ClosingStructureEntity" Relationship="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_2_0" FromRole="ClosingStructuresCalculationEntity" ToRole="ClosingStructureEntity" />
+          <NavigationProperty Name="HydraulicLocationEntity" Relationship="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_0_0" FromRole="ClosingStructuresCalculationEntity" ToRole="HydraulicLocationEntity" />
+          <NavigationProperty Name="ForeshoreProfileEntity" Relationship="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_1_0" FromRole="ClosingStructuresCalculationEntity" ToRole="ForeshoreProfileEntity" />
+        </EntityType>
         <EntityType Name="ClosingStructuresSectionResultEntity">
           <Key>
             <PropertyRef Name="ClosingStructuresSectionResultEntityId" />
@@ -2485,6 +2704,7 @@
           <Property Name="Y" Type="Double" />
           <Property Name="X0" Type="Double" />
           <Property Name="Order" Type="Int32" Nullable="false" />
+          <NavigationProperty Name="ClosingStructuresCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_1_0" FromRole="ForeshoreProfileEntity" ToRole="ClosingStructuresCalculationEntity" />
           <NavigationProperty Name="FailureMechanismEntity" Relationship="RingtoetsEntitiesModel.FK_ForeshoreProfileEntity_0_0" FromRole="ForeshoreProfileEntity" ToRole="FailureMechanismEntity" />
           <NavigationProperty Name="GrassCoverErosionOutwardsWaveConditionsCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_1_0" FromRole="ForeshoreProfileEntity" ToRole="GrassCoverErosionOutwardsWaveConditionsCalculationEntity" />
           <NavigationProperty Name="HeightStructuresCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_HeightStructuresCalculationEntity_2_0" FromRole="ForeshoreProfileEntity" ToRole="HeightStructuresCalculationEntity" />
@@ -2720,6 +2940,7 @@
           <NavigationProperty Name="ForeshoreProfileEntity" Relationship="RingtoetsEntitiesModel.FK_HeightStructuresCalculationEntity_2_0" FromRole="HeightStructuresCalculationEntity" ToRole="ForeshoreProfileEntity" />
           <NavigationProperty Name="HeightStructureEntity" Relationship="RingtoetsEntitiesModel.FK_HeightStructuresCalculationEntity_1_0" FromRole="HeightStructuresCalculationEntity" ToRole="HeightStructureEntity" />
           <NavigationProperty Name="HydraulicLocationEntity" Relationship="RingtoetsEntitiesModel.FK_HeightStructuresCalculationEntity_0_0" FromRole="HeightStructuresCalculationEntity" ToRole="HydraulicLocationEntity" />
+          <NavigationProperty Name="HeightStructuresOutputEntities" Relationship="RingtoetsEntitiesModel.FK_HeightStructuresOutputEntity_0_0" FromRole="HeightStructuresCalculationEntity" ToRole="HeightStructuresOutputEntity" />
         </EntityType>
         <EntityType Name="HeightStructuresFailureMechanismMetaEntity">
           <Key>
@@ -2730,6 +2951,19 @@
           <Property Name="N" Type="Int32" Nullable="false" />
           <NavigationProperty Name="FailureMechanismEntity" Relationship="RingtoetsEntitiesModel.FK_HeightStructuresFailureMechanismMetaEntity_0_0" FromRole="HeightStructuresFailureMechanismMetaEntity" ToRole="FailureMechanismEntity" />
         </EntityType>
+        <EntityType Name="HeightStructuresOutputEntity">
+          <Key>
+            <PropertyRef Name="HeightStructuresOutputEntityId" />
+          </Key>
+          <Property Name="HeightStructuresOutputEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="HeightStructuresCalculationEntityId" Type="Int64" Nullable="false" />
+          <Property Name="RequiredProbability" Type="Double" />
+          <Property Name="RequiredReliability" Type="Double" />
+          <Property Name="Probability" Type="Double" />
+          <Property Name="Reliability" Type="Double" />
+          <Property Name="FactorOfSafety" Type="Double" />
+          <NavigationProperty Name="HeightStructuresCalculationEntity" Relationship="RingtoetsEntitiesModel.FK_HeightStructuresOutputEntity_0_0" FromRole="HeightStructuresOutputEntity" ToRole="HeightStructuresCalculationEntity" />
+        </EntityType>
         <EntityType Name="HeightStructuresSectionResultEntity">
           <Key>
             <PropertyRef Name="HeightStructuresSectionResultEntityId" />
@@ -2756,6 +2990,7 @@
           <Property Name="DesignWaterLevelCalculationConvergence" Type="Byte" Nullable="false" />
           <Property Name="WaveHeightCalculationConvergence" Type="Byte" Nullable="false" />
           <NavigationProperty Name="AssessmentSectionEntity" Relationship="RingtoetsEntitiesModel.FK_HydraulicLocationEntity_0_0" FromRole="HydraulicLocationEntity" ToRole="AssessmentSectionEntity" />
+          <NavigationProperty Name="ClosingStructuresCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_0_0" FromRole="HydraulicLocationEntity" ToRole="ClosingStructuresCalculationEntity" />
           <NavigationProperty Name="GrassCoverErosionInwardsCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_GrassCoverErosionInwardsCalculationEntity_0_0" FromRole="HydraulicLocationEntity" ToRole="GrassCoverErosionInwardsCalculationEntity" />
           <NavigationProperty Name="HeightStructuresCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_HeightStructuresCalculationEntity_0_0" FromRole="HydraulicLocationEntity" ToRole="HeightStructuresCalculationEntity" />
           <NavigationProperty Name="PipingCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_PipingCalculationEntity_2_0" FromRole="HydraulicLocationEntity" ToRole="PipingCalculationEntity" />
@@ -2865,6 +3100,7 @@
           <Property Name="PipingCalculationEntityId" Type="Int64" Nullable="false" />
           <Property Name="Order" Type="Int32" Nullable="false" />
           <Property Name="UpliftFactorOfSafety" Type="Double" />
+          <Property Name="UpliftReliability" Type="Double" />
           <Property Name="UpliftProbability" Type="Double" />
           <Property Name="HeaveFactorOfSafety" Type="Double" />
           <Property Name="HeaveReliability" Type="Double" />
@@ -3235,6 +3471,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_ClosingStructuresCalculationEntity_3_0">
+          <End Type="RingtoetsEntitiesModel.CalculationGroupEntity" Role="CalculationGroupEntity" Multiplicity="1" />
+          <End Type="RingtoetsEntitiesModel.ClosingStructuresCalculationEntity" Role="ClosingStructuresCalculationEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="CalculationGroupEntity">
+              <PropertyRef Name="CalculationGroupEntityId" />
+            </Principal>
+            <Dependent Role="ClosingStructuresCalculationEntity">
+              <PropertyRef Name="CalculationGroupEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_FailureMechanismEntity_0_0">
           <End Type="RingtoetsEntitiesModel.CalculationGroupEntity" Role="CalculationGroupEntity" Multiplicity="0..1" />
           <End Type="RingtoetsEntitiesModel.FailureMechanismEntity" Role="FailureMechanismEntity" Multiplicity="*" />
@@ -3343,6 +3591,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_ClosingStructuresCalculationEntity_2_0">
+          <End Type="RingtoetsEntitiesModel.ClosingStructureEntity" Role="ClosingStructureEntity" Multiplicity="0..1" />
+          <End Type="RingtoetsEntitiesModel.ClosingStructuresCalculationEntity" Role="ClosingStructuresCalculationEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="ClosingStructureEntity">
+              <PropertyRef Name="ClosingStructureEntityId" />
+            </Principal>
+            <Dependent Role="ClosingStructuresCalculationEntity">
+              <PropertyRef Name="ClosingStructureEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_ClosingStructureFailureMechanismMetaEntity_0_0">
           <End Type="RingtoetsEntitiesModel.FailureMechanismEntity" Role="FailureMechanismEntity" Multiplicity="1" />
           <End Type="RingtoetsEntitiesModel.ClosingStructureFailureMechanismMetaEntity" Role="ClosingStructureFailureMechanismMetaEntity" Multiplicity="*" />
@@ -3355,6 +3615,30 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_ClosingStructuresCalculationEntity_0_0">
+          <End Type="RingtoetsEntitiesModel.HydraulicLocationEntity" Role="HydraulicLocationEntity" Multiplicity="0..1" />
+          <End Type="RingtoetsEntitiesModel.ClosingStructuresCalculationEntity" Role="ClosingStructuresCalculationEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="HydraulicLocationEntity">
+              <PropertyRef Name="HydraulicLocationEntityId" />
+            </Principal>
+            <Dependent Role="ClosingStructuresCalculationEntity">
+              <PropertyRef Name="HydraulicLocationEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_ClosingStructuresCalculationEntity_1_0">
+          <End Type="RingtoetsEntitiesModel.ForeshoreProfileEntity" Role="ForeshoreProfileEntity" Multiplicity="0..1" />
+          <End Type="RingtoetsEntitiesModel.ClosingStructuresCalculationEntity" Role="ClosingStructuresCalculationEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="ForeshoreProfileEntity">
+              <PropertyRef Name="ForeshoreProfileEntityId" />
+            </Principal>
+            <Dependent Role="ClosingStructuresCalculationEntity">
+              <PropertyRef Name="ForeshoreProfileEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_ClosingStructuresSectionResultEntity_0_0">
           <End Type="RingtoetsEntitiesModel.FailureMechanismSectionEntity" Role="FailureMechanismSectionEntity" Multiplicity="1" />
           <End Type="RingtoetsEntitiesModel.ClosingStructuresSectionResultEntity" Role="ClosingStructuresSectionResultEntity" Multiplicity="*" />
@@ -3871,6 +4155,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_HeightStructuresOutputEntity_0_0">
+          <End Type="RingtoetsEntitiesModel.HeightStructuresCalculationEntity" Role="HeightStructuresCalculationEntity" Multiplicity="1" />
+          <End Type="RingtoetsEntitiesModel.HeightStructuresOutputEntity" Role="HeightStructuresOutputEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="HeightStructuresCalculationEntity">
+              <PropertyRef Name="HeightStructuresCalculationEntityId" />
+            </Principal>
+            <Dependent Role="HeightStructuresOutputEntity">
+              <PropertyRef Name="HeightStructuresCalculationEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_PipingCalculationEntity_2_0">
           <End Type="RingtoetsEntitiesModel.HydraulicLocationEntity" Role="HydraulicLocationEntity" Multiplicity="0..1" />
           <End Type="RingtoetsEntitiesModel.PipingCalculationEntity" Role="PipingCalculationEntity" Multiplicity="*" />
@@ -4107,6 +4403,55 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="ClosingStructuresCalculationEntities">
+            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.ClosingStructuresCalculationEntity">
+              <MappingFragment StoreEntitySet="ClosingStructuresCalculationEntity">
+                <ScalarProperty Name="FactorStormDurationOpenStructure" ColumnName="FactorStormDurationOpenStructure" />
+                <ScalarProperty Name="StormDurationMean" ColumnName="StormDurationMean" />
+                <ScalarProperty Name="ModelFactorSuperCriticalFlowMean" ColumnName="ModelFactorSuperCriticalFlowMean" />
+                <ScalarProperty Name="DrainCoefficientMean" ColumnName="DrainCoefficientMean" />
+                <ScalarProperty Name="DeviationWaveDirection" ColumnName="DeviationWaveDirection" />
+                <ScalarProperty Name="FailureProbabilityStructureWithErosion" ColumnName="FailureProbabilityStructureWithErosion" />
+                <ScalarProperty Name="InflowModelType" ColumnName="InflowModelType" />
+                <ScalarProperty Name="FailureProbablityReparation" ColumnName="FailureProbablityReparation" />
+                <ScalarProperty Name="IdenticalApertures" ColumnName="IdenticalApertures" />
+                <ScalarProperty Name="FailureProbabilityOpenStructure" ColumnName="FailureProbabilityOpenStructure" />
+                <ScalarProperty Name="ProbabilityOpenStructureBeforeFlooding" ColumnName="ProbabilityOpenStructureBeforeFlooding" />
+                <ScalarProperty Name="FlowWidthAtBottomProtectionStandardDeviation" ColumnName="FlowWidthAtBottomProtectionStandardDeviation" />
+                <ScalarProperty Name="FlowWidthAtBottomProtectionMean" ColumnName="FlowWidthAtBottomProtectionMean" />
+                <ScalarProperty Name="CriticalOvertoppingDischargeCoefficientOfVariation" ColumnName="CriticalOvertoppingDischargeCoefficientOfVariation" />
+                <ScalarProperty Name="CriticalOvertoppingDischargeMean" ColumnName="CriticalOvertoppingDischargeMean" />
+                <ScalarProperty Name="AreaFlowAperturesStandardDeviation" ColumnName="AreaFlowAperturesStandardDeviation" />
+                <ScalarProperty Name="AreaFlowAperturesMean" ColumnName="AreaFlowAperturesMean" />
+                <ScalarProperty Name="ThresholdHeightOpenWeirStandardDeviation" ColumnName="ThresholdHeightOpenWeirStandardDeviation" />
+                <ScalarProperty Name="ThresholdHeightOpenWeirMean" ColumnName="ThresholdHeightOpenWeirMean" />
+                <ScalarProperty Name="InsideWaterLevelStandardDeviation" ColumnName="InsideWaterLevelStandardDeviation" />
+                <ScalarProperty Name="InsideWaterLevelMean" ColumnName="InsideWaterLevelMean" />
+                <ScalarProperty Name="LevelCrestStructureNotClosingStandardDeviation" ColumnName="LevelCrestStructureNotClosingStandardDeviation" />
+                <ScalarProperty Name="LevelCrestStructureNotClosingMean" ColumnName="LevelCrestStructureNotClosingMean" />
+                <ScalarProperty Name="WidthFlowAperturesCoefficientOfVariation" ColumnName="WidthFlowAperturesCoefficientOfVariation" />
+                <ScalarProperty Name="WidthFlowAperturesMean" ColumnName="WidthFlowAperturesMean" />
+                <ScalarProperty Name="AllowedLevelIncreaseStorageStandardDeviation" ColumnName="AllowedLevelIncreaseStorageStandardDeviation" />
+                <ScalarProperty Name="AllowedLevelIncreaseStorageMean" ColumnName="AllowedLevelIncreaseStorageMean" />
+                <ScalarProperty Name="StorageStructureAreaCoefficientOfVariation" ColumnName="StorageStructureAreaCoefficientOfVariation" />
+                <ScalarProperty Name="StorageStructureAreaMean" ColumnName="StorageStructureAreaMean" />
+                <ScalarProperty Name="StructureNormalOrientation" ColumnName="StructureNormalOrientation" />
+                <ScalarProperty Name="Orientation" ColumnName="Orientation" />
+                <ScalarProperty Name="UseForeshore" ColumnName="UseForeshore" />
+                <ScalarProperty Name="BreakWaterHeight" ColumnName="BreakWaterHeight" />
+                <ScalarProperty Name="BreakWaterType" ColumnName="BreakWaterType" />
+                <ScalarProperty Name="UseBreakWater" ColumnName="UseBreakWater" />
+                <ScalarProperty Name="Comments" ColumnName="Comments" />
+                <ScalarProperty Name="Name" ColumnName="Name" />
+                <ScalarProperty Name="Order" ColumnName="Order" />
+                <ScalarProperty Name="ClosingStructureEntityId" ColumnName="ClosingStructureEntityId" />
+                <ScalarProperty Name="HydraulicLocationEntityId" ColumnName="HydraulicLocationEntityId" />
+                <ScalarProperty Name="ForeshoreProfileEntityId" ColumnName="ForeshoreProfileEntityId" />
+                <ScalarProperty Name="CalculationGroupEntityId" ColumnName="CalculationGroupEntityId" />
+                <ScalarProperty Name="ClosingStructuresCalculationEntityId" ColumnName="ClosingStructuresCalculationEntityId" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="ClosingStructuresSectionResultEntities">
             <EntityTypeMapping TypeName="RingtoetsEntitiesModel.ClosingStructuresSectionResultEntity">
               <MappingFragment StoreEntitySet="ClosingStructuresSectionResultEntity">
@@ -4413,6 +4758,19 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="HeightStructuresOutputEntities">
+            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.HeightStructuresOutputEntity">
+              <MappingFragment StoreEntitySet="HeightStructuresOutputEntity">
+                <ScalarProperty Name="FactorOfSafety" ColumnName="FactorOfSafety" />
+                <ScalarProperty Name="Reliability" ColumnName="Reliability" />
+                <ScalarProperty Name="Probability" ColumnName="Probability" />
+                <ScalarProperty Name="RequiredReliability" ColumnName="RequiredReliability" />
+                <ScalarProperty Name="RequiredProbability" ColumnName="RequiredProbability" />
+                <ScalarProperty Name="HeightStructuresCalculationEntityId" ColumnName="HeightStructuresCalculationEntityId" />
+                <ScalarProperty Name="HeightStructuresOutputEntityId" ColumnName="HeightStructuresOutputEntityId" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="HeightStructuresSectionResultEntities">
             <EntityTypeMapping TypeName="RingtoetsEntitiesModel.HeightStructuresSectionResultEntity">
               <MappingFragment StoreEntitySet="HeightStructuresSectionResultEntity">
@@ -4545,6 +4903,7 @@
                 <ScalarProperty Name="HeaveReliability" ColumnName="HeaveReliability" />
                 <ScalarProperty Name="HeaveFactorOfSafety" ColumnName="HeaveFactorOfSafety" />
                 <ScalarProperty Name="UpliftProbability" ColumnName="UpliftProbability" />
+                <ScalarProperty Name="UpliftReliability" ColumnName="UpliftReliability" />
                 <ScalarProperty Name="UpliftFactorOfSafety" ColumnName="UpliftFactorOfSafety" />
                 <ScalarProperty Name="Order" ColumnName="Order" />
                 <ScalarProperty Name="PipingCalculationEntityId" ColumnName="PipingCalculationEntityId" />
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -r9d44bbbae4b9c8fd9c6087fb36e7cd701b5297ac -rab4d75b5749af0a12698661f818e922e59125f7a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram	(.../RingtoetsEntities.edmx.diagram)	(revision 9d44bbbae4b9c8fd9c6087fb36e7cd701b5297ac)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram	(.../RingtoetsEntities.edmx.diagram)	(revision ab4d75b5749af0a12698661f818e922e59125f7a)
@@ -5,65 +5,68 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="143406871b624a3080def7c3c31a548f" Name="Diagram1" ZoomLevel="47">
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.AssessmentSectionEntity" Width="1.5" PointX="3" PointY="78.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.CalculationGroupEntity" Width="1.5" PointX="3" PointY="73.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.CharacteristicPointEntity" Width="1.5" PointX="9.75" PointY="53.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructureEntity" Width="1.5" PointX="7.5" PointY="33.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructureFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructuresSectionResultEntity" Width="1.5" PointX="9.75" PointY="92.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DikeProfileEntity" Width="1.5" PointX="7.5" PointY="43.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DuneErosionSectionResultEntity" Width="1.5" PointX="9.75" PointY="103.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismEntity" Width="1.5" PointX="5.25" PointY="77.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismSectionEntity" Width="1.5" PointX="7.5" PointY="99.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ForeshoreProfileEntity" Width="1.5" PointX="7.5" PointY="126.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsCalculationEntity" Width="1.5" PointX="12.75" PointY="116" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="41.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsOutputEntity" Width="1.5" PointX="15" PointY="116.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsSectionResultEntity" Width="1.5" PointX="15" PointY="109" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="51" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsHydraulicLocationEntity" Width="1.5" PointX="7.5" PointY="131.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="112.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsWaveConditionsCalculationEntity" Width="1.5" PointX="12.75" PointY="128.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsWaveConditionsOutputEntity" Width="1.5" PointX="15" PointY="129.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverSlipOffInwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="121" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverSlipOffOutwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="89.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructureEntity" Width="1.5" PointX="7.5" PointY="71.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresCalculationEntity" Width="1.5" PointX="9.75" PointY="128.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="27.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresSectionResultEntity" Width="1.5" PointX="9.75" PointY="98" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HydraulicLocationEntity" Width="1.5" PointX="5.25" PointY="188.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.MacrostabilityInwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="80.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.MacrostabilityOutwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="123.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.MicrostabilitySectionResultEntity" Width="1.5" PointX="9.75" PointY="100.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingCalculationEntity" Width="1.5" PointX="12" PointY="109" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingCalculationOutputEntity" Width="1.5" PointX="14.25" PointY="104.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="57.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingSectionResultEntity" Width="1.5" PointX="9.75" PointY="86.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingSemiProbabilisticOutputEntity" Width="1.5" PointX="14.25" PointY="122.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingStructureSectionResultEntity" Width="1.5" PointX="9.75" PointY="109.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ProjectEntity" Width="1.5" PointX="0.75" PointY="79.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilLayerEntity" Width="1.5" PointX="9.75" PointY="20.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilProfileEntity" Width="1.5" PointX="7.5" PointY="21.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructureEntity" Width="1.5" PointX="7.5" PointY="60" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructuresFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="48.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructuresSectionResultEntity" Width="1.5" PointX="9.75" PointY="118.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverSectionResultEntity" Width="1.5" PointX="9.75" PointY="115.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverWaveConditionsCalculationEntity" Width="1.5" PointX="12.75" PointY="157.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverWaveConditionsOutputEntity" Width="1.5" PointX="15" PointY="158.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilModelEntity" Width="1.5" PointX="7.5" PointY="30" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilProfileEntity" Width="1.5" PointX="9.75" PointY="30" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StrengthStabilityLengthwiseConstructionSectionResultEntity" Width="1.5" PointX="9.75" PointY="106.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SurfaceLineEntity" Width="1.5" PointX="7.5" PointY="53.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.TechnicalInnovationSectionResultEntity" Width="1.5" PointX="9.75" PointY="83.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.AssessmentSectionEntity" Width="1.5" PointX="3" PointY="80.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.CalculationGroupEntity" Width="1.5" PointX="3" PointY="75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.CharacteristicPointEntity" Width="1.5" PointX="9.75" PointY="126.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructureEntity" Width="1.5" PointX="7.5" PointY="129.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructureFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="89.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructuresCalculationEntity" Width="1.5" PointX="15.75" PointY="137.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructuresSectionResultEntity" Width="1.5" PointX="9.75" PointY="54.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DikeProfileEntity" Width="1.5" PointX="7.5" PointY="119" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DuneErosionSectionResultEntity" Width="1.5" PointX="9.75" PointY="40.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismEntity" Width="1.5" PointX="5.25" PointY="79.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismSectionEntity" Width="1.5" PointX="7.5" PointY="50.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ForeshoreProfileEntity" Width="1.5" PointX="7.5" PointY="95" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsCalculationEntity" Width="1.5" PointX="9.75" PointY="154.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="123.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsOutputEntity" Width="1.5" PointX="12" PointY="158.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsSectionResultEntity" Width="1.5" PointX="12" PointY="104" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="86.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsHydraulicLocationEntity" Width="1.5" PointX="7.5" PointY="100.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="69.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsWaveConditionsCalculationEntity" Width="1.5" PointX="9.75" PointY="96.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsWaveConditionsOutputEntity" Width="1.5" PointX="12" PointY="98" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverSlipOffInwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="63.375" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverSlipOffOutwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="66.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructureEntity" Width="1.5" PointX="7.5" PointY="78" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresCalculationEntity" Width="1.5" PointX="9.75" PointY="133" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="84.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresOutputEntity" Width="1.5" PointX="12" PointY="135.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresSectionResultEntity" Width="1.5" PointX="9.75" PointY="29.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HydraulicLocationEntity" Width="1.5" PointX="5.25" PointY="191.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.MacrostabilityInwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.MacrostabilityOutwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="32" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.MicrostabilitySectionResultEntity" Width="1.5" PointX="9.75" PointY="43.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingCalculationEntity" Width="1.5" PointX="18" PointY="136" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingCalculationOutputEntity" Width="1.5" PointX="20.25" PointY="134.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="104.375" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingSectionResultEntity" Width="1.5" PointX="9.75" PointY="37.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingSemiProbabilisticOutputEntity" Width="1.5" PointX="20.25" PointY="138.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingStructureSectionResultEntity" Width="1.5" PointX="9.75" PointY="60.375" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ProjectEntity" Width="1.5" PointX="0.75" PointY="81.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilLayerEntity" Width="1.5" PointX="9.75" PointY="78.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilProfileEntity" Width="1.5" PointX="7.5" PointY="75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructureEntity" Width="1.5" PointX="7.5" PointY="107.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructuresFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="26.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructuresSectionResultEntity" Width="1.5" PointX="9.75" PointY="51.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverSectionResultEntity" Width="1.5" PointX="9.75" PointY="34.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverWaveConditionsCalculationEntity" Width="1.5" PointX="9.75" PointY="142.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverWaveConditionsOutputEntity" Width="1.5" PointX="12" PointY="149" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilModelEntity" Width="1.5" PointX="7.5" PointY="91.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilProfileEntity" Width="1.5" PointX="9.75" PointY="91.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StrengthStabilityLengthwiseConstructionSectionResultEntity" Width="1.5" PointX="9.75" PointY="57.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SurfaceLineEntity" Width="1.5" PointX="7.5" PointY="126.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.TechnicalInnovationSectionResultEntity" Width="1.5" PointX="9.75" PointY="46.375" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.VersionEntity" Width="1.5" PointX="0.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaterPressureAsphaltCoverSectionResultEntity" Width="1.5" PointX="9.75" PointY="78.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverSectionResultEntity" Width="1.5" PointX="9.75" PointY="95.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverWaveConditionsCalculationEntity" Width="1.5" PointX="9.75" PointY="157.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverWaveConditionsOutputEntity" Width="1.5" PointX="12" PointY="163.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaterPressureAsphaltCoverSectionResultEntity" Width="1.5" PointX="9.75" PointY="49.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverSectionResultEntity" Width="1.5" PointX="9.75" PointY="72.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverWaveConditionsCalculationEntity" Width="1.5" PointX="12.75" PointY="142.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverWaveConditionsOutputEntity" Width="1.5" PointX="15" PointY="149" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_AssessmentSectionEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_FailureMechanismEntity_1_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_HydraulicLocationEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_CalculationGroupEntity_0_0" />
+        <AssociationConnector Association="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_3_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_FailureMechanismEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_GrassCoverErosionInwardsCalculationEntity_2_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_2_0" />
@@ -73,7 +76,10 @@
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_2_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_CharacteristicPointEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_ClosingStructureEntity_0_0" />
+        <AssociationConnector Association="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_2_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_ClosingStructureFailureMechanismMetaEntity_0_0" />
+        <AssociationConnector Association="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_0_0" />
+        <AssociationConnector Association="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_1_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_ClosingStructuresSectionResultEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_DikeProfileEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_GrassCoverErosionInwardsCalculationEntity_1_0" />
@@ -117,6 +123,7 @@
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_GrassCoverErosionOutwardsWaveConditionsOutputEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_HeightStructuresCalculationEntity_1_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_HeightStructuresCalculationEntity_0_0" />
+        <AssociationConnector Association="RingtoetsEntitiesModel.FK_HeightStructuresOutputEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_PipingCalculationEntity_2_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_StabilityStoneCoverWaveConditionsCalculationEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_0_0" />