Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyResultFactory.cs
===================================================================
diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r4d4e101f475ebbd4646e8879031236c187b2d879
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyResultFactory.cs	(.../FailureMechanismSectionAssemblyResultFactory.cs)	(revision 391d022746e1bd895983935af75594fd3b1912d4)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyResultFactory.cs	(.../FailureMechanismSectionAssemblyResultFactory.cs)	(revision 4d4e101f475ebbd4646e8879031236c187b2d879)
@@ -46,11 +46,11 @@
         /// to assemble with.</param>
         /// <param name="useLengthEffect">Indicator whether to use the length effect or not.</param>
         /// <param name="sectionN">The N value for the section.</param>
-        /// <returns>A <see cref="FailureMechanismSectionAssemblyResult"/>.</returns>
+        /// <returns>A <see cref="FailureMechanismSectionAssemblyResultWrapper"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/>,
         /// <paramref name="assessmentSection"/> or <paramref name="calculateProbabilityStrategy"/> is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when the section could not be successfully assembled.</exception>
-        public static FailureMechanismSectionAssemblyResult AssembleSection(
+        public static FailureMechanismSectionAssemblyResultWrapper AssembleSection(
             AdoptableWithProfileProbabilityFailureMechanismSectionResult sectionResult, IAssessmentSection assessmentSection,
             IFailureMechanismSectionResultCalculateProbabilityStrategy calculateProbabilityStrategy,
             bool useLengthEffect, double sectionN)
@@ -108,10 +108,10 @@
         /// <param name="sectionResult">The section result to assemble for.</param>
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> to assemble with.</param>
         /// <param name="calculateProbabilityFunc">The <see cref="Func{TResult}"/> to calculate the probability with.</param>
-        /// <returns>A <see cref="FailureMechanismSectionAssemblyResult"/>.</returns>
+        /// <returns>A <see cref="FailureMechanismSectionAssemblyResultWrapper"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any argument is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when the section could not be successfully assembled.</exception>
-        public static FailureMechanismSectionAssemblyResult AssembleSection(
+        public static FailureMechanismSectionAssemblyResultWrapper AssembleSection(
             AdoptableFailureMechanismSectionResult sectionResult, IAssessmentSection assessmentSection, Func<double> calculateProbabilityFunc)
         {
             if (sectionResult == null)
@@ -149,11 +149,11 @@
         /// <param name="sectionResult">The section result to assemble for.</param>
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> to assemble with.</param>
         /// <param name="useLengthEffect">Indicator whether to use the length effect or not.</param>
-        /// <returns>A <see cref="FailureMechanismSectionAssemblyResult"/>.</returns>
+        /// <returns>A <see cref="FailureMechanismSectionAssemblyResultWrapper"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/> or <paramref name="assessmentSection"/>
         /// is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when the section could not be successfully assembled.</exception>
-        public static FailureMechanismSectionAssemblyResult AssembleSection(
+        public static FailureMechanismSectionAssemblyResultWrapper AssembleSection(
             NonAdoptableWithProfileProbabilityFailureMechanismSectionResult sectionResult, IAssessmentSection assessmentSection,
             bool useLengthEffect)
         {
@@ -190,10 +190,10 @@
         /// </summary>
         /// <param name="sectionResult">The section result to assemble for.</param>
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> to assemble with.</param>
-        /// <returns>A <see cref="FailureMechanismSectionAssemblyResult"/>.</returns>
+        /// <returns>A <see cref="FailureMechanismSectionAssemblyResultWrapper"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when the section could not be successfully assembled.</exception>
-        public static FailureMechanismSectionAssemblyResult AssembleSection(
+        public static FailureMechanismSectionAssemblyResultWrapper AssembleSection(
             NonAdoptableFailureMechanismSectionResult sectionResult, IAssessmentSection assessmentSection)
         {
             if (sectionResult == null)
@@ -269,9 +269,9 @@
         /// Performs the assembly based on the <see cref="FailureMechanismSectionAssemblyInput"/>.
         /// </summary>
         /// <param name="input">The input to use in the assembly.</param>
-        /// <returns>A <see cref="FailureMechanismSectionAssemblyResult"/>.</returns>
+        /// <returns>A <see cref="FailureMechanismSectionAssemblyResultWrapper"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when the section could not be successfully assembled.</exception>
-        private static FailureMechanismSectionAssemblyResult PerformAssembly(FailureMechanismSectionAssemblyInput input)
+        private static FailureMechanismSectionAssemblyResultWrapper PerformAssembly(FailureMechanismSectionAssemblyInput input)
         {
             IFailureMechanismSectionAssemblyCalculator calculator = AssemblyToolCalculatorFactory.Instance.CreateFailureMechanismSectionAssemblyCalculator(
                 AssemblyToolKernelFactory.Instance);
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismSectionAssemblyResultFactoryTest.cs
===================================================================
diff -u -r57fce1dddb5ea61181bd630f082d2518df54e51d -r4d4e101f475ebbd4646e8879031236c187b2d879
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismSectionAssemblyResultFactoryTest.cs	(.../FailureMechanismSectionAssemblyResultFactoryTest.cs)	(revision 57fce1dddb5ea61181bd630f082d2518df54e51d)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismSectionAssemblyResultFactoryTest.cs	(.../FailureMechanismSectionAssemblyResultFactoryTest.cs)	(revision 4d4e101f475ebbd4646e8879031236c187b2d879)
@@ -334,7 +334,7 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                FailureMechanismSectionAssemblyResult result = FailureMechanismSectionAssemblyResultFactory.AssembleSection(
+                FailureMechanismSectionAssemblyResultWrapper result = FailureMechanismSectionAssemblyResultFactory.AssembleSection(
                     sectionResult, assessmentSection, calculateStrategy, random.NextBoolean(), random.NextDouble());
 
                 // Assert
@@ -494,7 +494,7 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                FailureMechanismSectionAssemblyResult result = FailureMechanismSectionAssemblyResultFactory.AssembleSection(sectionResult, assessmentSection, () => double.NaN);
+                FailureMechanismSectionAssemblyResultWrapper result = FailureMechanismSectionAssemblyResultFactory.AssembleSection(sectionResult, assessmentSection, () => double.NaN);
 
                 // Assert
                 Assert.AreSame(calculator.FailureMechanismSectionAssemblyResultOutput, result);
@@ -677,7 +677,7 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                FailureMechanismSectionAssemblyResult result = FailureMechanismSectionAssemblyResultFactory.AssembleSection(
+                FailureMechanismSectionAssemblyResultWrapper result = FailureMechanismSectionAssemblyResultFactory.AssembleSection(
                     sectionResult, assessmentSection, random.NextBoolean());
 
                 // Assert
@@ -807,7 +807,7 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                FailureMechanismSectionAssemblyResult result = FailureMechanismSectionAssemblyResultFactory.AssembleSection(
+                FailureMechanismSectionAssemblyResultWrapper result = FailureMechanismSectionAssemblyResultFactory.AssembleSection(
                     sectionResult, assessmentSection);
 
                 // Assert