Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0 -r1a0c7226c07b8ada3b39a562ddd5b54dc67b82c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensions.cs	(.../HeightStructuresSectionResultEntityReadExtensions.cs)	(revision 4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensions.cs	(.../HeightStructuresSectionResultEntityReadExtensions.cs)	(revision 1a0c7226c07b8ada3b39a562ddd5b54dc67b82c4)
@@ -23,6 +23,7 @@
 using Application.Ringtoets.Storage.DbContext;
 using Core.Common.Base.Data;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Primitives;
 using Ringtoets.HeightStructures.Data;
 
 namespace Application.Ringtoets.Storage.Read.HeightStructures
@@ -57,11 +58,16 @@
                 throw new ArgumentNullException(nameof(collector));
             }
 
-            sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne;
-            sectionResult.TailorMadeAssessmentProbability = entity.LayerThree.ToNullAsNaN();
+            sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType)entity.SimpleAssessmentResult;
+            sectionResult.DetailedAssessmentResult = (DetailedAssessmentProbabilityOnlyResultType)entity.DetailedAssessmentResult;
+            sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentProbabilityCalculationResultType)entity.TailorMadeAssessmentResult;
+            sectionResult.TailorMadeAssessmentProbability = entity.TailorMadeAssessmentProbability.ToNullAsNaN();
+            sectionResult.UseManualAssemblyProbability = Convert.ToBoolean(entity.UseManualAssemblyProbability);
+            sectionResult.ManualAssemblyProbability = entity.ManualAssemblyProbability.ToNullAsNaN();
 
             if (entity.HeightStructuresCalculationEntity != null)
             {
+
                 sectionResult.Calculation = entity.HeightStructuresCalculationEntity.Read(collector);
             }
         }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r8d37f4040238a84405d8f08363ec706232a35326 -r1a0c7226c07b8ada3b39a562ddd5b54dc67b82c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs	(.../HeightStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 8d37f4040238a84405d8f08363ec706232a35326)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs	(.../HeightStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 1a0c7226c07b8ada3b39a562ddd5b54dc67b82c4)
@@ -26,8 +26,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
+using Ringtoets.Common.Primitives;
 using Ringtoets.HeightStructures.Data;
 
 namespace Application.Ringtoets.Storage.Test.Read.HeightStructures
@@ -69,45 +69,53 @@
         {
             // Setup
             var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-            double layerThree = random.NextDouble();
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>();
+            double tailorMadeAssessmentProbability = random.NextDouble();
+            bool useManualAssemblyProbability = random.NextBoolean();
+            double manualAssemblyProbability = random.NextDouble();
 
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
             collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
             var entity = new HeightStructuresSectionResultEntity
             {
-                LayerOne = Convert.ToByte(layerOne),
-                LayerThree = layerThree,
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
+                FailureMechanismSectionEntity = failureMechanismSectionEntity,
+                SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult),
+                DetailedAssessmentResult = Convert.ToByte(detailedAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(tailorMadeAssessmentResult),
+                TailorMadeAssessmentProbability = tailorMadeAssessmentProbability,
+                UseManualAssemblyProbability = Convert.ToByte(useManualAssemblyProbability),
+                ManualAssemblyProbability = manualAssemblyProbability
             };
             var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
 
             // Assert
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
-            Assert.AreEqual(layerThree, sectionResult.TailorMadeAssessmentProbability, 1e-6);
+            Assert.AreEqual(simpleAssessmentResult, sectionResult.SimpleAssessmentResult);
+            Assert.AreEqual(simpleAssessmentResult, sectionResult.SimpleAssessmentResult);
+            Assert.AreEqual(detailedAssessmentResult, sectionResult.DetailedAssessmentResult);
+            Assert.AreEqual(tailorMadeAssessmentResult, sectionResult.TailorMadeAssessmentResult);
+            Assert.AreEqual(tailorMadeAssessmentProbability, sectionResult.TailorMadeAssessmentProbability, 1e-6);
+            Assert.AreEqual(useManualAssemblyProbability, sectionResult.UseManualAssemblyProbability);
+            Assert.AreEqual(manualAssemblyProbability, sectionResult.ManualAssemblyProbability, 1e-6);
             Assert.IsNull(sectionResult.Calculation);
         }
 
         [Test]
-        public void Read_EntityWithNullValues_SectionResultWithNaNValues()
+        public void Read_EntityWithNullValues_SectionResultWithExpectedValuesValues()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
             collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
             var entity = new HeightStructuresSectionResultEntity
             {
-                LayerOne = Convert.ToByte(layerOne),
-                LayerThree = null,
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
             var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
@@ -116,8 +124,8 @@
             entity.Read(sectionResult, collector);
 
             // Assert
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
             Assert.IsNaN(sectionResult.TailorMadeAssessmentProbability);
+            Assert.IsNaN(sectionResult.ManualAssemblyProbability);
             Assert.IsNull(sectionResult.Calculation);
         }