Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/RegistrationState/ClosingStructuresFailureMechanismView.cs
===================================================================
diff -u -r2326e8b55b8ba1742cd8965553d0084bf53d1364 -ra30be36af675abf5ed475f8bae5e876eb9546f1b
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/RegistrationState/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision 2326e8b55b8ba1742cd8965553d0084bf53d1364)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/RegistrationState/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision a30be36af675abf5ed475f8bae5e876eb9546f1b)
@@ -74,7 +74,7 @@
             sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
 
             assemblyResultsMapLayer = new CalculatableFailureMechanismSectionResultsMapLayer<ClosingStructuresFailureMechanism, AdoptableFailureMechanismSectionResult, ClosingStructuresInput>(
-                FailureMechanism, sr => StructuresFailureMechanismAssemblyFactory.AssembleSection<ClosingStructuresInput>(sr, FailureMechanism, AssessmentSection));
+                FailureMechanism, sr => StructuresFailureMechanismAssemblyFactory.AssembleSection<ClosingStructuresInput>(sr, FailureMechanism, AssessmentSection).AssemblyResult);
 
             sectionsMapDataCollection.Add(sectionsMapData);
             sectionsMapDataCollection.Add(sectionsStartPointMapData);
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/RegistrationState/DuneErosionFailureMechanismView.cs
===================================================================
diff -u -r8ae7522403830ec33cc3543de6dd89f4490cc402 -ra30be36af675abf5ed475f8bae5e876eb9546f1b
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/RegistrationState/DuneErosionFailureMechanismView.cs	(.../DuneErosionFailureMechanismView.cs)	(revision 8ae7522403830ec33cc3543de6dd89f4490cc402)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/RegistrationState/DuneErosionFailureMechanismView.cs	(.../DuneErosionFailureMechanismView.cs)	(revision a30be36af675abf5ed475f8bae5e876eb9546f1b)
@@ -85,7 +85,7 @@
             sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
 
             assemblyResultMapLayer = new NonCalculatableFailureMechanismSectionResultsMapLayer<NonAdoptableFailureMechanismSectionResult>(
-                FailureMechanism, sr => FailureMechanismSectionAssemblyResultFactory.AssembleSection(sr, AssessmentSection));
+                FailureMechanism, sr => FailureMechanismSectionAssemblyResultFactory.AssembleSection(sr, AssessmentSection).AssemblyResult);
 
             sectionsMapDataCollection.Add(sectionsMapData);
             sectionsMapDataCollection.Add(sectionsStartPointMapData);
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/RegistrationState/GrassCoverErosionInwardsFailureMechanismView.cs
===================================================================
diff -u -r5627e1c5a1cb246097e86828ad7a8e340ee564c4 -ra30be36af675abf5ed475f8bae5e876eb9546f1b
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/RegistrationState/GrassCoverErosionInwardsFailureMechanismView.cs	(.../GrassCoverErosionInwardsFailureMechanismView.cs)	(revision 5627e1c5a1cb246097e86828ad7a8e340ee564c4)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/RegistrationState/GrassCoverErosionInwardsFailureMechanismView.cs	(.../GrassCoverErosionInwardsFailureMechanismView.cs)	(revision a30be36af675abf5ed475f8bae5e876eb9546f1b)
@@ -73,7 +73,7 @@
             sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
 
             assemblyResultMapLayer = new CalculatableFailureMechanismSectionResultsMapLayer<GrassCoverErosionInwardsFailureMechanism, AdoptableWithProfileProbabilityFailureMechanismSectionResult, GrassCoverErosionInwardsInput>(
-                FailureMechanism, sr => GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection));
+                FailureMechanism, sr => GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection).AssemblyResult);
 
             sectionsMapDataCollection.Add(sectionsMapData);
             sectionsMapDataCollection.Add(sectionsStartPointMapData);
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/RegistrationState/GrassCoverErosionOutwardsFailureMechanismView.cs
===================================================================
diff -u -r9f9170f3212fc97c50e3d50d443f52b0bb2b7d1b -ra30be36af675abf5ed475f8bae5e876eb9546f1b
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/RegistrationState/GrassCoverErosionOutwardsFailureMechanismView.cs	(.../GrassCoverErosionOutwardsFailureMechanismView.cs)	(revision 9f9170f3212fc97c50e3d50d443f52b0bb2b7d1b)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/RegistrationState/GrassCoverErosionOutwardsFailureMechanismView.cs	(.../GrassCoverErosionOutwardsFailureMechanismView.cs)	(revision a30be36af675abf5ed475f8bae5e876eb9546f1b)
@@ -73,7 +73,7 @@
             sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
 
             assemblyResultMapLayer = new NonCalculatableFailureMechanismSectionResultsMapLayer<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
-                FailureMechanism, sr => GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection));
+                FailureMechanism, sr => GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection).AssemblyResult);
 
             sectionsMapDataCollection.Add(sectionsMapData);
             sectionsMapDataCollection.Add(sectionsStartPointMapData);
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/RegistrationState/HeightStructuresFailureMechanismView.cs
===================================================================
diff -u -r49dcec749045c1b5350496fd6c26cbc1256938dc -ra30be36af675abf5ed475f8bae5e876eb9546f1b
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/RegistrationState/HeightStructuresFailureMechanismView.cs	(.../HeightStructuresFailureMechanismView.cs)	(revision 49dcec749045c1b5350496fd6c26cbc1256938dc)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/RegistrationState/HeightStructuresFailureMechanismView.cs	(.../HeightStructuresFailureMechanismView.cs)	(revision a30be36af675abf5ed475f8bae5e876eb9546f1b)
@@ -74,7 +74,7 @@
             sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
 
             assemblyResultsMapLayer = new CalculatableFailureMechanismSectionResultsMapLayer<HeightStructuresFailureMechanism, AdoptableFailureMechanismSectionResult, HeightStructuresInput>(
-                FailureMechanism, sr => StructuresFailureMechanismAssemblyFactory.AssembleSection<HeightStructuresInput>(sr, FailureMechanism, AssessmentSection));
+                FailureMechanism, sr => StructuresFailureMechanismAssemblyFactory.AssembleSection<HeightStructuresInput>(sr, FailureMechanism, AssessmentSection).AssemblyResult);
 
             sectionsMapDataCollection.Add(sectionsMapData);
             sectionsMapDataCollection.Add(sectionsStartPointMapData);
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SpecificFailureMechanismView.cs
===================================================================
diff -u -r70cf59df57f263b83322a645a5b0a4daa9328b74 -ra30be36af675abf5ed475f8bae5e876eb9546f1b
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SpecificFailureMechanismView.cs	(.../SpecificFailureMechanismView.cs)	(revision 70cf59df57f263b83322a645a5b0a4daa9328b74)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SpecificFailureMechanismView.cs	(.../SpecificFailureMechanismView.cs)	(revision a30be36af675abf5ed475f8bae5e876eb9546f1b)
@@ -153,7 +153,7 @@
             sectionsMapDataCollection.Add(sectionsEndPointMapData);
 
             assemblyResultMapLayer = new NonCalculatableFailureMechanismSectionResultsMapLayer<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
-                failureMechanism, sr => FailureMechanismAssemblyFactory.AssembleSection(sr, failureMechanism, assessmentSection));
+                failureMechanism, sr => FailureMechanismAssemblyFactory.AssembleSection(sr, failureMechanism, assessmentSection).AssemblyResult);
 
             failureMechanismMapDataCollection.Add(referenceLineMapData);
             failureMechanismMapDataCollection.Add(sectionsMapDataCollection);
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/RegistrationState/MacroStabilityInwardsFailureMechanismView.cs
===================================================================
diff -u -r683f8939ea395ffe9b29a54cc87005244a5af182 -ra30be36af675abf5ed475f8bae5e876eb9546f1b
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/RegistrationState/MacroStabilityInwardsFailureMechanismView.cs	(.../MacroStabilityInwardsFailureMechanismView.cs)	(revision 683f8939ea395ffe9b29a54cc87005244a5af182)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/RegistrationState/MacroStabilityInwardsFailureMechanismView.cs	(.../MacroStabilityInwardsFailureMechanismView.cs)	(revision a30be36af675abf5ed475f8bae5e876eb9546f1b)
@@ -72,7 +72,7 @@
             sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
 
             assemblyResultsMapLayer = new CalculatableFailureMechanismSectionResultsMapLayer<MacroStabilityInwardsFailureMechanism, AdoptableWithProfileProbabilityFailureMechanismSectionResult, MacroStabilityInwardsInput>(
-                FailureMechanism, sr => MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection));
+                FailureMechanism, sr => MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection).AssemblyResult);
 
             sectionsMapDataCollection.Add(sectionsMapData);
             sectionsMapDataCollection.Add(sectionsStartPointMapData);
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/RegistrationState/PipingFailureMechanismView.cs
===================================================================
diff -u -r4833951758a4115a1ae02558a02696f2dedf4950 -ra30be36af675abf5ed475f8bae5e876eb9546f1b
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/RegistrationState/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 4833951758a4115a1ae02558a02696f2dedf4950)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/RegistrationState/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision a30be36af675abf5ed475f8bae5e876eb9546f1b)
@@ -56,7 +56,7 @@
             base.CreateMapData();
 
             assemblyResultMapLayer = new CalculatableFailureMechanismSectionResultsMapLayer<PipingFailureMechanism, AdoptableWithProfileProbabilityFailureMechanismSectionResult, PipingInput>(
-                FailureMechanism, sr => PipingFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection));
+                FailureMechanism, sr => PipingFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection).AssemblyResult);
             MapDataCollection.Insert(4, assemblyResultMapLayer.MapData);
         }
     }
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/RegistrationState/StabilityPointStructuresFailureMechanismView.cs
===================================================================
diff -u -r345aaa998981d0e439b8c296c76071f2ccdef824 -ra30be36af675abf5ed475f8bae5e876eb9546f1b
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/RegistrationState/StabilityPointStructuresFailureMechanismView.cs	(.../StabilityPointStructuresFailureMechanismView.cs)	(revision 345aaa998981d0e439b8c296c76071f2ccdef824)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/RegistrationState/StabilityPointStructuresFailureMechanismView.cs	(.../StabilityPointStructuresFailureMechanismView.cs)	(revision a30be36af675abf5ed475f8bae5e876eb9546f1b)
@@ -74,7 +74,7 @@
             sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
 
             assemblyResultsMapLayer = new CalculatableFailureMechanismSectionResultsMapLayer<StabilityPointStructuresFailureMechanism, AdoptableFailureMechanismSectionResult, StabilityPointStructuresInput>(
-                FailureMechanism, sr => StructuresFailureMechanismAssemblyFactory.AssembleSection<StabilityPointStructuresInput>(sr, FailureMechanism, AssessmentSection));
+                FailureMechanism, sr => StructuresFailureMechanismAssemblyFactory.AssembleSection<StabilityPointStructuresInput>(sr, FailureMechanism, AssessmentSection).AssemblyResult);
 
             sectionsMapDataCollection.Add(sectionsMapData);
             sectionsMapDataCollection.Add(sectionsStartPointMapData);
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/Views/RegistrationState/StabilityStoneCoverFailureMechanismView.cs
===================================================================
diff -u -r9dc12897a31f07deb9c2467b166ef94f48da9794 -ra30be36af675abf5ed475f8bae5e876eb9546f1b
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/Views/RegistrationState/StabilityStoneCoverFailureMechanismView.cs	(.../StabilityStoneCoverFailureMechanismView.cs)	(revision 9dc12897a31f07deb9c2467b166ef94f48da9794)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/Views/RegistrationState/StabilityStoneCoverFailureMechanismView.cs	(.../StabilityStoneCoverFailureMechanismView.cs)	(revision a30be36af675abf5ed475f8bae5e876eb9546f1b)
@@ -73,7 +73,7 @@
             sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
 
             assemblyResultMapLayer = new NonCalculatableFailureMechanismSectionResultsMapLayer<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
-                FailureMechanism, sr => StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection));
+                FailureMechanism, sr => StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection).AssemblyResult);
 
             sectionsMapDataCollection.Add(sectionsMapData);
             sectionsMapDataCollection.Add(sectionsStartPointMapData);
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/RegistrationState/WaveImpactAsphaltCoverFailureMechanismView.cs
===================================================================
diff -u -rac7f4c3eecc95a1f469ceb08178b77965742b974 -ra30be36af675abf5ed475f8bae5e876eb9546f1b
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/RegistrationState/WaveImpactAsphaltCoverFailureMechanismView.cs	(.../WaveImpactAsphaltCoverFailureMechanismView.cs)	(revision ac7f4c3eecc95a1f469ceb08178b77965742b974)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/RegistrationState/WaveImpactAsphaltCoverFailureMechanismView.cs	(.../WaveImpactAsphaltCoverFailureMechanismView.cs)	(revision a30be36af675abf5ed475f8bae5e876eb9546f1b)
@@ -73,7 +73,7 @@
             sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
 
             assemblyResultMapLayer = new NonCalculatableFailureMechanismSectionResultsMapLayer<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
-                FailureMechanism, sr => WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection));
+                FailureMechanism, sr => WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection).AssemblyResult);
 
             sectionsMapDataCollection.Add(sectionsMapData);
             sectionsMapDataCollection.Add(sectionsStartPointMapData);