Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r590e1aeba4a1e5a622c8e8d89270167907920b43 -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensions.cs	(.../GrassCoverSlipOffInwardsSectionResultEntityReadExtensions.cs)	(revision 590e1aeba4a1e5a622c8e8d89270167907920b43)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensions.cs	(.../GrassCoverSlipOffInwardsSectionResultEntityReadExtensions.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -21,7 +21,8 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Read
@@ -36,18 +37,28 @@
         /// Reads the <see cref="GrassCoverSlipOffInwardsSectionResultEntity"/> and use the information to update a 
         /// <see cref="GrassCoverSlipOffInwardsFailureMechanismSectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="GrassCoverSlipOffInwardsSectionResultEntity"/> to create <see cref="GrassCoverSlipOffInwardsFailureMechanismSectionResult"/> for.</param>
+        /// <param name="entity">The <see cref="GrassCoverSlipOffInwardsSectionResultEntity"/> used to update the
+        /// <see cref="GrassCoverSlipOffInwardsFailureMechanismSectionResult"/>.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <returns>A new <see cref="GrassCoverSlipOffInwardsFailureMechanismSectionResult"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         internal static void Read(this GrassCoverSlipOffInwardsSectionResultEntity entity, GrassCoverSlipOffInwardsFailureMechanismSectionResult sectionResult)
         {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
             if (sectionResult == null)
             {
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
-            sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne;
+            sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType) entity.SimpleAssessmentResult;
+            sectionResult.DetailedAssessmentResult = (DetailedAssessmentResultType) entity.DetailedAssessmentResult;
+            sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentResultType) entity.TailorMadeAssessmentResult;
+            sectionResult.UseManualAssemblyCategoryGroup = Convert.ToBoolean(entity.UseManualAssemblyCategoryGroup);
+            sectionResult.ManualAssemblyCategoryGroup = (FailureMechanismSectionAssemblyCategoryGroup) entity.TailorMadeAssessmentResult;
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r64fdab6f623c85ae3ad1b030ff4046c61773a38e -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensions.cs	(.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensions.cs)	(revision 64fdab6f623c85ae3ad1b030ff4046c61773a38e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensions.cs	(.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensions.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -21,7 +21,8 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Read
@@ -36,18 +37,28 @@
         /// Reads the <see cref="GrassCoverSlipOffOutwardsSectionResultEntity"/> and use the information to update a 
         /// <see cref="GrassCoverSlipOffOutwardsFailureMechanismSectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="GrassCoverSlipOffOutwardsSectionResultEntity"/> to create <see cref="GrassCoverSlipOffOutwardsFailureMechanismSectionResult"/> for.</param>
+        /// <param name="entity">The <see cref="GrassCoverSlipOffOutwardsSectionResultEntity"/> used to update the
+        /// <see cref="GrassCoverSlipOffOutwardsFailureMechanismSectionResult"/>.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <returns>A new <see cref="GrassCoverSlipOffOutwardsFailureMechanismSectionResult"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         internal static void Read(this GrassCoverSlipOffOutwardsSectionResultEntity entity, GrassCoverSlipOffOutwardsFailureMechanismSectionResult sectionResult)
         {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
             if (sectionResult == null)
             {
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
-            sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne;
+            sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType) entity.SimpleAssessmentResult;
+            sectionResult.DetailedAssessmentResult = (DetailedAssessmentResultType) entity.DetailedAssessmentResult;
+            sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentResultType) entity.TailorMadeAssessmentResult;
+            sectionResult.UseManualAssemblyCategoryGroup = Convert.ToBoolean(entity.UseManualAssemblyCategoryGroup);
+            sectionResult.ManualAssemblyCategoryGroup = (FailureMechanismSectionAssemblyCategoryGroup) entity.TailorMadeAssessmentResult;
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r183eb0cda52b8014d27bb22ccea6c76d7cc3a1de -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensions.cs	(.../MacroStabilityOutwardsSectionResultEntityReadExtensions.cs)	(revision 183eb0cda52b8014d27bb22ccea6c76d7cc3a1de)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensions.cs	(.../MacroStabilityOutwardsSectionResultEntityReadExtensions.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -21,7 +21,8 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Read.MacroStabilityOutwards
@@ -36,20 +37,30 @@
         /// Reads the <see cref="MacroStabilityOutwardsSectionResultEntity"/> and use the information to update a 
         /// <see cref="MacroStabilityOutwardsFailureMechanismSectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="MacroStabilityOutwardsSectionResultEntity"/> to create <see cref="MacroStabilityOutwardsFailureMechanismSectionResult"/> for.</param>
+        /// <param name="entity">The <see cref="MacroStabilityOutwardsSectionResultEntity"/> used to update the
+        /// <see cref="MacroStabilityOutwardsFailureMechanismSectionResult"/>.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <returns>A new <see cref="MacroStabilityOutwardsFailureMechanismSectionResult"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         internal static void Read(this MacroStabilityOutwardsSectionResultEntity entity, MacroStabilityOutwardsFailureMechanismSectionResult sectionResult)
         {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
             if (sectionResult == null)
             {
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
-            sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne;
-            sectionResult.DetailedAssessmentProbability = entity.LayerTwoA.ToNullAsNaN();
-            sectionResult.TailorMadeAssessmentProbability = entity.LayerThree.ToNullAsNaN();
+            sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType) entity.SimpleAssessmentResult;
+            sectionResult.DetailedAssessmentResult = (DetailedAssessmentProbabilityOnlyResultType) entity.DetailedAssessmentResult;
+            sectionResult.DetailedAssessmentProbability = entity.DetailedAssessmentProbability.ToNullAsNaN();
+            sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentProbabilityAndDetailedCalculationResultType) entity.TailorMadeAssessmentResult;
+            sectionResult.TailorMadeAssessmentProbability = entity.TailorMadeAssessmentProbability.ToNullAsNaN();
+            sectionResult.UseManualAssemblyCategoryGroup = Convert.ToBoolean(entity.UseManualAssemblyCategoryGroup);
+            sectionResult.ManualAssemblyCategoryGroup = (FailureMechanismSectionAssemblyCategoryGroup) entity.ManualAssemblyCategoryGroup;
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MicrostabilitySectionResultEntityReadExtensions.cs
===================================================================
diff -u -r4503f687155622bb1b19155d27f8e3f9a5842fb0 -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MicrostabilitySectionResultEntityReadExtensions.cs	(.../MicrostabilitySectionResultEntityReadExtensions.cs)	(revision 4503f687155622bb1b19155d27f8e3f9a5842fb0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MicrostabilitySectionResultEntityReadExtensions.cs	(.../MicrostabilitySectionResultEntityReadExtensions.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -21,7 +21,8 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Read
@@ -36,18 +37,28 @@
         /// Reads the <see cref="MicrostabilitySectionResultEntity"/> and use the information to update a 
         /// <see cref="MicrostabilityFailureMechanismSectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="MicrostabilitySectionResultEntity"/> to create <see cref="MicrostabilityFailureMechanismSectionResult"/> for.</param>
+        /// <param name="entity">The <see cref="MicrostabilitySectionResultEntity"/> used to update the
+        /// <see cref="MicrostabilityFailureMechanismSectionResult"/>.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <returns>A new <see cref="MicrostabilityFailureMechanismSectionResult"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         internal static void Read(this MicrostabilitySectionResultEntity entity, MicrostabilityFailureMechanismSectionResult sectionResult)
         {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
             if (sectionResult == null)
             {
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
-            sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne;
+            sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType) entity.SimpleAssessmentResult;
+            sectionResult.DetailedAssessmentResult = (DetailedAssessmentResultType) entity.DetailedAssessmentResult;
+            sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentResultType) entity.TailorMadeAssessmentResult;
+            sectionResult.UseManualAssemblyCategoryGroup = Convert.ToBoolean(entity.UseManualAssemblyCategoryGroup);
+            sectionResult.ManualAssemblyCategoryGroup = (FailureMechanismSectionAssemblyCategoryGroup) entity.TailorMadeAssessmentResult;
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r80e09f002643af4dbacc7e99574ce0c784c7e873 -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensions.cs	(.../PipingStructureSectionResultEntityReadExtensions.cs)	(revision 80e09f002643af4dbacc7e99574ce0c784c7e873)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensions.cs	(.../PipingStructureSectionResultEntityReadExtensions.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -21,7 +21,8 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Read.PipingStructure
@@ -36,19 +37,28 @@
         /// Read the <see cref="PipingStructureSectionResultEntity"/> and use the information to update the
         /// <paramref name="sectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="PipingStructureSectionResultEntity"/> to use to update the
+        /// <param name="entity">The <see cref="PipingStructureSectionResultEntity"/> used to update the
         /// <paramref name="sectionResult"/>.</param>
         /// <param name="sectionResult">The <see cref="PipingStructureFailureMechanismSectionResult"/> to be updated.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         internal static void Read(this PipingStructureSectionResultEntity entity,
                                   PipingStructureFailureMechanismSectionResult sectionResult)
         {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
             if (sectionResult == null)
             {
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
-            sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne;
+            sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType) entity.SimpleAssessmentResult;
+            sectionResult.DetailedAssessmentResult = (DetailedAssessmentResultType) entity.DetailedAssessmentResult;
+            sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentResultType) entity.TailorMadeAssessmentResult;
+            sectionResult.UseManualAssemblyCategoryGroup = Convert.ToBoolean(entity.UseManualAssemblyCategoryGroup);
+            sectionResult.ManualAssemblyCategoryGroup = (FailureMechanismSectionAssemblyCategoryGroup) entity.TailorMadeAssessmentResult;
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r802d3cd39b925ac9873ea277588ecd1933e374f6 -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs	(.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs)	(revision 802d3cd39b925ac9873ea277588ecd1933e374f6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs	(.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -21,7 +21,8 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Read
@@ -36,18 +37,28 @@
         /// Reads the <see cref="StrengthStabilityLengthwiseConstructionSectionResultEntity"/> and use the information to construct a 
         /// <see cref="StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="StrengthStabilityLengthwiseConstructionSectionResultEntity"/> to create <see cref="StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult"/> for.</param>
+        /// <param name="entity">The <see cref="StrengthStabilityLengthwiseConstructionSectionResultEntity"/> used to update the
+        /// <see cref="StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult"/>.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <returns>A new <see cref="StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/> is <c>null</c>.</exception>
-        internal static void Read(this StrengthStabilityLengthwiseConstructionSectionResultEntity entity, StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult sectionResult)
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        internal static void Read(this StrengthStabilityLengthwiseConstructionSectionResultEntity entity,
+                                  StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult sectionResult)
         {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
             if (sectionResult == null)
             {
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
-            sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne;
+            sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType) entity.SimpleAssessmentResult;
+            sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentResultType) entity.TailorMadeAssessmentResult;
+            sectionResult.UseManualAssemblyCategoryGroup = Convert.ToBoolean(entity.UseManualAssemblyCategoryGroup);
+            sectionResult.ManualAssemblyCategoryGroup = (FailureMechanismSectionAssemblyCategoryGroup) entity.TailorMadeAssessmentResult;
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/TechnicalInnovationSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r341edbfd5905c218dcbaacdc77b68ca67e5424cf -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/TechnicalInnovationSectionResultEntityReadExtensions.cs	(.../TechnicalInnovationSectionResultEntityReadExtensions.cs)	(revision 341edbfd5905c218dcbaacdc77b68ca67e5424cf)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/TechnicalInnovationSectionResultEntityReadExtensions.cs	(.../TechnicalInnovationSectionResultEntityReadExtensions.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -21,7 +21,8 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Read
@@ -36,18 +37,27 @@
         /// Reads the <see cref="TechnicalInnovationSectionResultEntity"/> and use the information to construct a 
         /// <see cref="TechnicalInnovationFailureMechanismSectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="TechnicalInnovationSectionResultEntity"/> to create <see cref="TechnicalInnovationFailureMechanismSectionResult"/> for.</param>
+        /// <param name="entity">The <see cref="TechnicalInnovationSectionResultEntity"/> used to update the
+        /// <see cref="TechnicalInnovationFailureMechanismSectionResult"/>.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <returns>A new <see cref="TechnicalInnovationFailureMechanismSectionResult"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         internal static void Read(this TechnicalInnovationSectionResultEntity entity, TechnicalInnovationFailureMechanismSectionResult sectionResult)
         {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
             if (sectionResult == null)
             {
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
-            sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne;
+            sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType) entity.SimpleAssessmentResult;
+            sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentResultType) entity.TailorMadeAssessmentResult;
+            sectionResult.UseManualAssemblyCategoryGroup = Convert.ToBoolean(entity.UseManualAssemblyCategoryGroup);
+            sectionResult.ManualAssemblyCategoryGroup = (FailureMechanismSectionAssemblyCategoryGroup) entity.TailorMadeAssessmentResult;
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r25f59fa52f81f0e5d8e1935f00abd21f2207bb7d -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs	(.../WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs)	(revision 25f59fa52f81f0e5d8e1935f00abd21f2207bb7d)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs	(.../WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -21,7 +21,8 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Read
@@ -36,17 +37,27 @@
         /// Reads the <see cref="WaterPressureAsphaltCoverSectionResultEntity"/> and use the information to construct a 
         /// <see cref="WaterPressureAsphaltCoverFailureMechanismSectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="WaterPressureAsphaltCoverSectionResultEntity"/> to create <see cref="WaterPressureAsphaltCoverFailureMechanismSectionResult"/> for.</param>
+        /// <param name="entity">The <see cref="WaterPressureAsphaltCoverSectionResultEntity"/> used to update the
+        /// <see cref="WaterPressureAsphaltCoverFailureMechanismSectionResult"/>.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <returns>A new <see cref="WaterPressureAsphaltCoverFailureMechanismSectionResult"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         internal static void Read(this WaterPressureAsphaltCoverSectionResultEntity entity, WaterPressureAsphaltCoverFailureMechanismSectionResult sectionResult)
         {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
             if (sectionResult == null)
             {
                 throw new ArgumentNullException(nameof(sectionResult));
             }
-            sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne;
+
+            sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType) entity.SimpleAssessmentResult;
+            sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentResultType) entity.TailorMadeAssessmentResult;
+            sectionResult.UseManualAssemblyCategoryGroup = Convert.ToBoolean(entity.UseManualAssemblyCategoryGroup);
+            sectionResult.ManualAssemblyCategoryGroup = (FailureMechanismSectionAssemblyCategoryGroup) entity.TailorMadeAssessmentResult;
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r590e1aeba4a1e5a622c8e8d89270167907920b43 -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs)	(revision 590e1aeba4a1e5a622c8e8d89270167907920b43)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Read
@@ -34,9 +35,23 @@
     public class GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest
     {
         [Test]
-        public void Read_SectionResultIsNull_ThrowArgumentNullException()
+        public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
+            var sectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+
+            // Call
+            TestDelegate test = () => ((GrassCoverSlipOffInwardsSectionResultEntity) null).Read(sectionResult);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("entity", exception.ParamName);
+        }
+
+        [Test]
+        public void Read_SectionResultNull_ThrowsArgumentNullException()
+        {
+            // Setup
             var entity = new GrassCoverSlipOffInwardsSectionResultEntity();
 
             // Call
@@ -48,32 +63,35 @@
         }
 
         [Test]
-        public void Read_ParameterValues_SectionResultWithParameterValues()
+        public void Read_ParameterValues_SetsSectionResultWithParameterValues()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-            var layerTwoA = random.NextEnumValue<AssessmentLayerTwoAResult>();
-            double layerThree = random.NextDouble();
+            var random = new Random(31);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
 
-            var collector = new ReadConversionCollector();
-
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
             var entity = new GrassCoverSlipOffInwardsSectionResultEntity
             {
-                LayerThree = layerThree,
-                LayerTwoA = Convert.ToByte(layerTwoA),
-                LayerOne = Convert.ToByte(layerOne),
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
+                SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult),
+                DetailedAssessmentResult = Convert.ToByte(detailedAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(tailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
             var sectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
 
             // Assert
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+            Assert.AreEqual(simpleAssessmentResult, sectionResult.SimpleAssessmentResult);
+            Assert.AreEqual(detailedAssessmentResult, sectionResult.DetailedAssessmentResult);
+            Assert.AreEqual(tailorMadeAssessmentResult, sectionResult.TailorMadeAssessmentResult);
+            Assert.AreEqual(useManualAssemblyCategoryGroup, sectionResult.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(manualAssemblyCategoryGroup, sectionResult.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r64fdab6f623c85ae3ad1b030ff4046c61773a38e -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs)	(revision 64fdab6f623c85ae3ad1b030ff4046c61773a38e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Read
@@ -34,9 +35,23 @@
     public class GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest
     {
         [Test]
-        public void Read_SectionResultIsNull_ThrowArgumentNullException()
+        public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
+            var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+
+            // Call
+            TestDelegate test = () => ((GrassCoverSlipOffOutwardsSectionResultEntity) null).Read(sectionResult);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("entity", exception.ParamName);
+        }
+
+        [Test]
+        public void Read_SectionResultNull_ThrowsArgumentNullException()
+        {
+            // Setup
             var entity = new GrassCoverSlipOffOutwardsSectionResultEntity();
 
             // Call
@@ -48,33 +63,35 @@
         }
 
         [Test]
-        public void Read_ParameterValues_SectionResultWithParameterValues()
+        public void Read_ParameterValues_SetsSectionResultWithParameterValues()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-            var layerTwoA = random.NextEnumValue<AssessmentLayerTwoAResult>();
-            double layerThree = random.NextDouble();
+            var random = new Random(31);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
 
-            var collector = new ReadConversionCollector();
-
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
             var entity = new GrassCoverSlipOffOutwardsSectionResultEntity
             {
-                LayerThree = layerThree,
-                LayerTwoA = Convert.ToByte(layerTwoA),
-                LayerOne = Convert.ToByte(layerOne),
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
+                SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult),
+                DetailedAssessmentResult = Convert.ToByte(detailedAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(tailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
             var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
 
             // Assert
-            Assert.IsNotNull(sectionResult);
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+            Assert.AreEqual(simpleAssessmentResult, sectionResult.SimpleAssessmentResult);
+            Assert.AreEqual(detailedAssessmentResult, sectionResult.DetailedAssessmentResult);
+            Assert.AreEqual(tailorMadeAssessmentResult, sectionResult.TailorMadeAssessmentResult);
+            Assert.AreEqual(useManualAssemblyCategoryGroup, sectionResult.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(manualAssemblyCategoryGroup, sectionResult.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r59512bde82de1297788119a8cacd067789389d41 -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs	(.../MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs)	(revision 59512bde82de1297788119a8cacd067789389d41)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs	(.../MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -21,12 +21,12 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
-using Application.Ringtoets.Storage.Read;
 using Application.Ringtoets.Storage.Read.MacroStabilityOutwards;
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Read.MacroStabilityOutwards
@@ -35,9 +35,23 @@
     public class MacroStabilityOutwardsSectionResultEntityReadExtensionsTest
     {
         [Test]
-        public void Read_SectionResultIsNull_ThrowArgumentNullException()
+        public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
+            var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+
+            // Call
+            TestDelegate test = () => ((MacroStabilityOutwardsSectionResultEntity) null).Read(sectionResult);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("entity", exception.ParamName);
+        }
+
+        [Test]
+        public void Read_SectionResultNull_ThrowsArgumentNullException()
+        {
+            // Setup
             var entity = new MacroStabilityOutwardsSectionResultEntity();
 
             // Call
@@ -49,61 +63,52 @@
         }
 
         [Test]
-        public void Read_ParameterValues_SectionResultWithParameterValues()
+        public void Read_ParameterValues_SetsSectionResultWithParameterValues()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-            double layerTwoA = random.NextDouble();
-            double layerThree = random.NextDouble();
+            var random = new Random(31);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
+            double detailedAssessmentProbability = random.NextDouble();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>();
+            double tailorMadeAssessmentProbability = random.NextDouble();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
 
-            var collector = new ReadConversionCollector();
-
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
             var entity = new MacroStabilityOutwardsSectionResultEntity
             {
-                LayerThree = layerThree,
-                LayerTwoA = layerTwoA,
-                LayerOne = Convert.ToByte(layerOne),
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
+                SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult),
+                DetailedAssessmentResult = Convert.ToByte(detailedAssessmentResult),
+                DetailedAssessmentProbability = detailedAssessmentProbability,
+                TailorMadeAssessmentResult = Convert.ToByte(tailorMadeAssessmentResult),
+                TailorMadeAssessmentProbability = tailorMadeAssessmentProbability,
+                UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
             var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
 
             // Assert
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
-            Assert.AreEqual(layerTwoA, sectionResult.DetailedAssessmentProbability, 1e-6);
-            Assert.AreEqual(layerThree, sectionResult.TailorMadeAssessmentProbability, 1e-6);
+            Assert.AreEqual(simpleAssessmentResult, sectionResult.SimpleAssessmentResult);
+            Assert.AreEqual(detailedAssessmentResult, sectionResult.DetailedAssessmentResult);
+            Assert.AreEqual(tailorMadeAssessmentResult, sectionResult.TailorMadeAssessmentResult);
+            Assert.AreEqual(useManualAssemblyCategoryGroup, sectionResult.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(manualAssemblyCategoryGroup, sectionResult.ManualAssemblyCategoryGroup);
         }
 
         [Test]
-        public void Read_EntityWithNullValues_SectionResultWithNaNValues()
+        public void Read_EntityWithNullValues_SetsSectionResultWithNaNValues()
         {
             // 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 MacroStabilityOutwardsSectionResultEntity
-            {
-                LayerThree = null,
-                LayerTwoA = null,
-                LayerOne = Convert.ToByte(layerOne),
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
-            };
+            var entity = new MacroStabilityOutwardsSectionResultEntity();
             var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
 
             // Assert
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
             Assert.IsNaN(sectionResult.DetailedAssessmentProbability);
             Assert.IsNaN(sectionResult.TailorMadeAssessmentProbability);
         }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r4503f687155622bb1b19155d27f8e3f9a5842fb0 -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs	(.../MicrostabilitySectionResultEntityReadExtensionsTest.cs)	(revision 4503f687155622bb1b19155d27f8e3f9a5842fb0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs	(.../MicrostabilitySectionResultEntityReadExtensionsTest.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Read
@@ -34,74 +35,63 @@
     public class MicrostabilitySectionResultEntityReadExtensionsTest
     {
         [Test]
-        public void Read_SectionResultIsNull_ThrowArgumentNullException()
+        public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
-            var entity = new MicrostabilitySectionResultEntity();
+            var sectionResult = new MicrostabilityFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
-            TestDelegate call = () => entity.Read(null);
+            TestDelegate test = () => ((MicrostabilitySectionResultEntity) null).Read(sectionResult);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("sectionResult", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("entity", exception.ParamName);
         }
 
         [Test]
-        public void Read_ParameterValues_SectionResultWithParameterValues()
+        public void Read_SectionResultNull_ThrowsArgumentNullException()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-            var layerTwoA = random.NextEnumValue<AssessmentLayerTwoAResult>();
-            double layerThree = random.NextDouble();
+            var entity = new MicrostabilitySectionResultEntity();
 
-            var collector = new ReadConversionCollector();
-
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
-            var entity = new MicrostabilitySectionResultEntity
-            {
-                LayerThree = layerThree,
-                LayerTwoA = Convert.ToByte(layerTwoA),
-                LayerOne = Convert.ToByte(layerOne),
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
-            };
-            var sectionResult = new MicrostabilityFailureMechanismSectionResult(new TestFailureMechanismSection());
-
             // Call
-            entity.Read(sectionResult);
+            TestDelegate call = () => entity.Read(null);
 
             // Assert
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("sectionResult", paramName);
         }
 
         [Test]
-        public void Read_EntityWithNullValues_SectionResultWitNaNValues()
+        public void Read_ParameterValues_SetsSectionResultWithParameterValues()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-            var layerTwoA = random.NextEnumValue<AssessmentLayerTwoAResult>();
+            var random = new Random(31);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
 
-            var collector = new ReadConversionCollector();
-
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
             var entity = new MicrostabilitySectionResultEntity
             {
-                LayerThree = null,
-                LayerTwoA = Convert.ToByte(layerTwoA),
-                LayerOne = Convert.ToByte(layerOne),
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
+                SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult),
+                DetailedAssessmentResult = Convert.ToByte(detailedAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(tailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
             var sectionResult = new MicrostabilityFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
 
             // Assert
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+            Assert.AreEqual(simpleAssessmentResult, sectionResult.SimpleAssessmentResult);
+            Assert.AreEqual(detailedAssessmentResult, sectionResult.DetailedAssessmentResult);
+            Assert.AreEqual(tailorMadeAssessmentResult, sectionResult.TailorMadeAssessmentResult);
+            Assert.AreEqual(useManualAssemblyCategoryGroup, sectionResult.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(manualAssemblyCategoryGroup, sectionResult.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r80e09f002643af4dbacc7e99574ce0c784c7e873 -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensionsTest.cs	(.../PipingStructureSectionResultEntityReadExtensionsTest.cs)	(revision 80e09f002643af4dbacc7e99574ce0c784c7e873)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensionsTest.cs	(.../PipingStructureSectionResultEntityReadExtensionsTest.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -21,12 +21,12 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
-using Application.Ringtoets.Storage.Read;
 using Application.Ringtoets.Storage.Read.PipingStructure;
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Read.PipingStructure
@@ -35,9 +35,23 @@
     public class PipingStructureSectionResultEntityReadExtensionsTest
     {
         [Test]
-        public void Read_SectionResultIsNull_ThrowArgumentNullException()
+        public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
+            var sectionResult = new PipingStructureFailureMechanismSectionResult(new TestFailureMechanismSection());
+
+            // Call
+            TestDelegate test = () => ((PipingStructureSectionResultEntity) null).Read(sectionResult);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("entity", exception.ParamName);
+        }
+
+        [Test]
+        public void Read_SectionResultNull_ThrowsArgumentNullException()
+        {
+            // Setup
             var entity = new PipingStructureSectionResultEntity();
 
             // Call
@@ -49,33 +63,35 @@
         }
 
         [Test]
-        public void Read_ParameterValues_SectionResultWithParameterValues()
+        public void Read_ParameterValues_SetsSectionResultWithParameterValues()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-            var layerTwoA = random.NextEnumValue<AssessmentLayerTwoAResult>();
-            double layerThree = random.NextDouble();
+            var random = new Random(31);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
 
-            var collector = new ReadConversionCollector();
-
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
             var entity = new PipingStructureSectionResultEntity
             {
-                LayerThree = layerThree,
-                LayerTwoA = Convert.ToByte(layerTwoA),
-                LayerOne = Convert.ToByte(layerOne),
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
+                SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult),
+                DetailedAssessmentResult = Convert.ToByte(detailedAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(tailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
             var sectionResult = new PipingStructureFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
 
             // Assert
-            Assert.IsNotNull(sectionResult);
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+            Assert.AreEqual(simpleAssessmentResult, sectionResult.SimpleAssessmentResult);
+            Assert.AreEqual(detailedAssessmentResult, sectionResult.DetailedAssessmentResult);
+            Assert.AreEqual(tailorMadeAssessmentResult, sectionResult.TailorMadeAssessmentResult);
+            Assert.AreEqual(useManualAssemblyCategoryGroup, sectionResult.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(manualAssemblyCategoryGroup, sectionResult.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r802d3cd39b925ac9873ea277588ecd1933e374f6 -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs	(.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs)	(revision 802d3cd39b925ac9873ea277588ecd1933e374f6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs	(.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Read
@@ -34,9 +35,23 @@
     public class StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest
     {
         [Test]
-        public void Read_SectionResultIsNull_ThrowArgumentNullException()
+        public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
+            var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(new TestFailureMechanismSection());
+
+            // Call
+            TestDelegate test = () => ((StrengthStabilityLengthwiseConstructionSectionResultEntity) null).Read(sectionResult);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("entity", exception.ParamName);
+        }
+
+        [Test]
+        public void Read_SectionResultNull_ThrowsArgumentNullException()
+        {
+            // Setup
             var entity = new StrengthStabilityLengthwiseConstructionSectionResultEntity();
 
             // Call
@@ -48,31 +63,32 @@
         }
 
         [Test]
-        public void Read_ParameterValues_SectionResultWithParameterValues()
+        public void Read_ParameterValues_SetsSectionResultWithParameterValues()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-            double layerThree = random.NextDouble();
+            var random = new Random(31);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
 
-            var collector = new ReadConversionCollector();
-
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
             var entity = new StrengthStabilityLengthwiseConstructionSectionResultEntity
             {
-                LayerThree = layerThree,
-                LayerOne = Convert.ToByte(layerOne),
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
+                SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(tailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
             var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
 
             // Assert
-            Assert.IsNotNull(sectionResult);
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+            Assert.AreEqual(simpleAssessmentResult, sectionResult.SimpleAssessmentResult);
+            Assert.AreEqual(tailorMadeAssessmentResult, sectionResult.TailorMadeAssessmentResult);
+            Assert.AreEqual(useManualAssemblyCategoryGroup, sectionResult.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(manualAssemblyCategoryGroup, sectionResult.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r341edbfd5905c218dcbaacdc77b68ca67e5424cf -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs	(.../TechnicalInnovationSectionResultEntityReadExtensionsTest.cs)	(revision 341edbfd5905c218dcbaacdc77b68ca67e5424cf)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs	(.../TechnicalInnovationSectionResultEntityReadExtensionsTest.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Read
@@ -34,9 +35,23 @@
     public class TechnicalInnovationSectionResultEntityReadExtensionsTest
     {
         [Test]
-        public void Read_SectionResultIsNull_ThrowArgumentNullException()
+        public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
+            var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(new TestFailureMechanismSection());
+
+            // Call
+            TestDelegate test = () => ((TechnicalInnovationSectionResultEntity) null).Read(sectionResult);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("entity", exception.ParamName);
+        }
+
+        [Test]
+        public void Read_SectionResultNull_ThrowsArgumentNullException()
+        {
+            // Setup
             var entity = new TechnicalInnovationSectionResultEntity();
 
             // Call
@@ -48,31 +63,32 @@
         }
 
         [Test]
-        public void Read_ParameterValues_SectionResultWithParameterValues()
+        public void Read_ParameterValues_SetsSectionResultWithParameterValues()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-            double layerThree = random.NextDouble();
+            var random = new Random(31);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
 
-            var collector = new ReadConversionCollector();
-
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
             var entity = new TechnicalInnovationSectionResultEntity
             {
-                LayerThree = layerThree,
-                LayerOne = Convert.ToByte(layerOne),
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
+                SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(tailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
             var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
 
             // Assert
-            Assert.IsNotNull(sectionResult);
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+            Assert.AreEqual(simpleAssessmentResult, sectionResult.SimpleAssessmentResult);
+            Assert.AreEqual(tailorMadeAssessmentResult, sectionResult.TailorMadeAssessmentResult);
+            Assert.AreEqual(useManualAssemblyCategoryGroup, sectionResult.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(manualAssemblyCategoryGroup, sectionResult.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r25f59fa52f81f0e5d8e1935f00abd21f2207bb7d -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs	(.../WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs)	(revision 25f59fa52f81f0e5d8e1935f00abd21f2207bb7d)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs	(.../WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Read
@@ -34,9 +35,23 @@
     public class WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest
     {
         [Test]
-        public void Read_SectionResultIsNull_ThrowArgumentNullException()
+        public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
+            var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection());
+
+            // Call
+            TestDelegate test = () => ((WaterPressureAsphaltCoverSectionResultEntity) null).Read(sectionResult);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("entity", exception.ParamName);
+        }
+
+        [Test]
+        public void Read_SectionResultNull_ThrowsArgumentNullException()
+        {
+            // Setup
             var entity = new WaterPressureAsphaltCoverSectionResultEntity();
 
             // Call
@@ -48,31 +63,32 @@
         }
 
         [Test]
-        public void Read_ParameterValues_SectionResultWithParameterValues()
+        public void Read_ParameterValues_SetsSectionResultWithParameterValues()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-            double layerThree = random.NextDouble();
+            var random = new Random(31);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
 
-            var collector = new ReadConversionCollector();
-
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
             var entity = new WaterPressureAsphaltCoverSectionResultEntity
             {
-                LayerThree = layerThree,
-                LayerOne = Convert.ToByte(layerOne),
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
+                SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(tailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
             var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
 
             // Assert
-            Assert.IsNotNull(sectionResult);
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+            Assert.AreEqual(simpleAssessmentResult, sectionResult.SimpleAssessmentResult);
+            Assert.AreEqual(tailorMadeAssessmentResult, sectionResult.TailorMadeAssessmentResult);
+            Assert.AreEqual(useManualAssemblyCategoryGroup, sectionResult.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(manualAssemblyCategoryGroup, sectionResult.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file