Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r753480c9461b7b5bb10eb7abe78224f24160a536 -rba5cba6640241fd1fc40cb471ebfbd737681f5aa
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 753480c9461b7b5bb10eb7abe78224f24160a536)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision ba5cba6640241fd1fc40cb471ebfbd737681f5aa)
@@ -1016,7 +1016,8 @@
         {
             return new AssessmentSectionEntity
             {
-                Norm = 1.0/30000
+                Norm = 1.0/30000,
+                Composition = Convert.ToInt16(AssessmentSectionComposition.Dike)
             };
         }
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -rba5cba6640241fd1fc40cb471ebfbd737681f5aa
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision ba5cba6640241fd1fc40cb471ebfbd737681f5aa)
@@ -265,12 +265,14 @@
                     new GrassCoverErosionOutwardsWaveConditionsOutputEntity
                     {
                         WaterLevel = outputBLevel,
-                        Order = 1
+                        Order = 1,
+                        CalculationConvergence = Convert.ToByte(CalculationConvergence.NotCalculated)
                     },
                     new GrassCoverErosionOutwardsWaveConditionsOutputEntity
                     {
                         WaterLevel = outputALevel,
-                        Order = 0
+                        Order = 0,
+                        CalculationConvergence = Convert.ToByte(CalculationConvergence.NotCalculated)
                     }
                 }
             };
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -rba5cba6640241fd1fc40cb471ebfbd737681f5aa
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsOutputEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputEntityReadExtensionsTest.cs)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsOutputEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputEntityReadExtensionsTest.cs)	(revision ba5cba6640241fd1fc40cb471ebfbd737681f5aa)
@@ -92,6 +92,7 @@
             // Setup
             var entity = new GrassCoverErosionOutwardsWaveConditionsOutputEntity
             {
+                CalculationConvergence = Convert.ToByte(CalculationConvergence.NotCalculated),
                 WaterLevel = null,
                 WaveHeight = null,
                 WavePeakPeriod = null,
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs
===================================================================
diff -u -r753480c9461b7b5bb10eb7abe78224f24160a536 -rba5cba6640241fd1fc40cb471ebfbd737681f5aa
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs	(.../ProjectEntityReadExtensionsTest.cs)	(revision 753480c9461b7b5bb10eb7abe78224f24160a536)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs	(.../ProjectEntityReadExtensionsTest.cs)	(revision ba5cba6640241fd1fc40cb471ebfbd737681f5aa)
@@ -24,6 +24,7 @@
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.Read;
 using NUnit.Framework;
+using Ringtoets.Common.Data.AssessmentSection;
 
 namespace Application.Ringtoets.Storage.Test.Read
 {
@@ -76,13 +77,15 @@
                     {
                         Norm = norm,
                         Name = "A",
-                        Order = 56
+                        Order = 56,
+                        Composition = Convert.ToInt16(AssessmentSectionComposition.Dike)
                     },
                     new AssessmentSectionEntity
                     {
                         Norm = norm,
                         Name = "B",
-                        Order = 0
+                        Order = 0,
+                        Composition = Convert.ToInt16(AssessmentSectionComposition.Dike)
                     }
                 }
             };
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -rba5cba6640241fd1fc40cb471ebfbd737681f5aa
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision ba5cba6640241fd1fc40cb471ebfbd737681f5aa)
@@ -265,18 +265,21 @@
                 {
                     new StabilityStoneCoverWaveConditionsOutputEntity
                     {
+                        CalculationConvergence = Convert.ToByte(CalculationConvergence.NotCalculated),
                         WaterLevel = outputBLevel,
                         Order = 1,
                         OutputType = Convert.ToByte(WaveConditionsOutputType.Columns)
                     },
                     new StabilityStoneCoverWaveConditionsOutputEntity
                     {
+                        CalculationConvergence = Convert.ToByte(CalculationConvergence.NotCalculated),
                         WaterLevel = outputCLevel,
                         Order = 2,
                         OutputType = Convert.ToByte(WaveConditionsOutputType.Blocks)
                     },
                     new StabilityStoneCoverWaveConditionsOutputEntity
                     {
+                        CalculationConvergence = Convert.ToByte(CalculationConvergence.NotCalculated),
                         WaterLevel = outputALevel,
                         Order = 0,
                         OutputType = Convert.ToByte(WaveConditionsOutputType.Columns)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -rba5cba6640241fd1fc40cb471ebfbd737681f5aa
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision ba5cba6640241fd1fc40cb471ebfbd737681f5aa)
@@ -264,11 +264,13 @@
                 {
                     new WaveImpactAsphaltCoverWaveConditionsOutputEntity
                     {
+                        CalculationConvergence = Convert.ToByte(CalculationConvergence.NotCalculated),
                         WaterLevel = outputBLevel,
                         Order = 1
                     },
                     new WaveImpactAsphaltCoverWaveConditionsOutputEntity
                     {
+                        CalculationConvergence = Convert.ToByte(CalculationConvergence.NotCalculated),
                         WaterLevel = outputALevel,
                         Order = 0
                     }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -rba5cba6640241fd1fc40cb471ebfbd737681f5aa
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensionsTest.cs)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensionsTest.cs)	(revision ba5cba6640241fd1fc40cb471ebfbd737681f5aa)
@@ -92,6 +92,7 @@
             // Setup
             var entity = new WaveImpactAsphaltCoverWaveConditionsOutputEntity
             {
+                CalculationConvergence = Convert.ToByte(CalculationConvergence.NotCalculated),
                 WaterLevel = null,
                 WaveHeight = null,
                 WavePeakPeriod = null,
Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/AssessmentSectionComposition.cs
===================================================================
diff -u -r1ddd0ecb63ccdcb00ce2f1f757ba5e0c64a5fb90 -rba5cba6640241fd1fc40cb471ebfbd737681f5aa
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/AssessmentSectionComposition.cs	(.../AssessmentSectionComposition.cs)	(revision 1ddd0ecb63ccdcb00ce2f1f757ba5e0c64a5fb90)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/AssessmentSectionComposition.cs	(.../AssessmentSectionComposition.cs)	(revision ba5cba6640241fd1fc40cb471ebfbd737681f5aa)
@@ -33,18 +33,18 @@
         /// The assessment section consists only out of 'dike' elements.
         /// </summary>
         [ResourcesDisplayName(typeof(Resources), "AssessmentSectionComposition_Dike")]
-        Dike = 0,
+        Dike = 1,
 
         /// <summary>
         /// The assessment section consists only out of 'dune' elements.
         /// </summary>
         [ResourcesDisplayName(typeof(Resources), "AssessmentSectionComposition_Dune")]
-        Dune = 1,
+        Dune = 2,
 
         /// <summary>
         /// The assessment section consists out of a combination of 'dike' and 'dune' elements.
         /// </summary>
         [ResourcesDisplayName(typeof(Resources), "AssessmentSectionComposition_DikeAndDune")]
-        DikeAndDune = 2
+        DikeAndDune = 3
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/CalculationConvergence.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -rba5cba6640241fd1fc40cb471ebfbd737681f5aa
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/CalculationConvergence.cs	(.../CalculationConvergence.cs)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/CalculationConvergence.cs	(.../CalculationConvergence.cs)	(revision ba5cba6640241fd1fc40cb471ebfbd737681f5aa)
@@ -33,18 +33,18 @@
         /// The calculation has not been performed.
         /// </summary>
         [ResourcesDisplayName(typeof(Resources), "CalculationConvergence_NotCalculated")]
-        NotCalculated = 0,
+        NotCalculated = 1,
 
         /// <summary>
         /// The calculation has not converged.
         /// </summary>
         [ResourcesDisplayName(typeof(Resources), "CalculationConvergence_CalculatedNotConverged")]
-        CalculatedNotConverged = 1,
+        CalculatedNotConverged = 2,
 
         /// <summary>
         /// The calculation has converged.
         /// </summary>
         [ResourcesDisplayName(typeof(Resources), "CalculationConvergence_CalculatedConverged")]
-        CalculatedConverged = 2
+        CalculatedConverged = 3
     }
 }
\ No newline at end of file