Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -rc64583d0bc73943162633d5517fa94e5e1557c8f -rebf1043695f8e56bb1e0659af3565344f70cd33f
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision c64583d0bc73943162633d5517fa94e5e1557c8f)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision ebf1043695f8e56bb1e0659af3565344f70cd33f)
@@ -109,15 +109,14 @@
 
         public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult,
                                                                           double probability,
-                                                                          AssessmentSection assessmentSection,
-                                                                          FailureMechanism failureMechanism)
+                                                                          AssemblyCategoriesInput assemblyCategoriesInput)
         {
             try
             {
                 IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
                 FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0G3(
-                    assessmentSection,
-                    failureMechanism,
+                    new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
+                    new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution),
                     FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG2(detailedAssessmentResult),
                     probability);
 
@@ -132,15 +131,14 @@
         public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult,
                                                                           double probability,
                                                                           double n,
-                                                                          AssessmentSection assessmentSection,
-                                                                          FailureMechanism failureMechanism)
+                                                                          AssemblyCategoriesInput assemblyCategoriesInput)
         {
             try
             {
                 IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
                 FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0G5(
-                    assessmentSection,
-                    failureMechanism,
+                    new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
+                    new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution),
                     n,
                     FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG2(detailedAssessmentResult),
                     probability);
@@ -201,15 +199,14 @@
 
         public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult,
                                                                             double probability,
-                                                                            AssessmentSection assessmentSection,
-                                                                            FailureMechanism failureMechanism)
+                                                                            AssemblyCategoriesInput assemblyCategoriesInput)
         {
             try
             {
                 IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
                 FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0T7(
-                    assessmentSection,
-                    failureMechanism,
+                    new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
+                    new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution),
                     FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT4(tailorMadeAssessmentResult),
                     probability);
 
@@ -223,15 +220,14 @@
 
         public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult,
                                                                             double probability,
-                                                                            AssessmentSection assessmentSection,
-                                                                            FailureMechanism failureMechanism)
+                                                                            AssemblyCategoriesInput assemblyCategoriesInput)
         {
             try
             {
                 IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
                 FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0T3(
-                    assessmentSection,
-                    failureMechanism,
+                    new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
+                    new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution),
                     FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3(tailorMadeAssessmentResult),
                     probability);
 
@@ -246,15 +242,14 @@
         public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult,
                                                                             double probability,
                                                                             double n,
-                                                                            AssessmentSection assessmentSection,
-                                                                            FailureMechanism failureMechanism)
+                                                                            AssemblyCategoriesInput assemblyCategoriesInput)
         {
             try
             {
                 IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
                 FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0T5(
-                    assessmentSection,
-                    failureMechanism,
+                    new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
+                    new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution),
                     n,
                     FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3(tailorMadeAssessmentResult),
                     probability);
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -r39ac1e1334032136e6cf3a8c7c398189431aeb81 -rebf1043695f8e56bb1e0659af3565344f70cd33f
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs	(.../IFailureMechanismSectionAssemblyCalculator.cs)	(revision 39ac1e1334032136e6cf3a8c7c398189431aeb81)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs	(.../IFailureMechanismSectionAssemblyCalculator.cs)	(revision ebf1043695f8e56bb1e0659af3565344f70cd33f)
@@ -64,8 +64,8 @@
         /// </summary>
         /// <param name="detailedAssessmentResult">The <see cref="DetailedAssessmentProbabilityOnlyResultType"/> to assemble for.</param>
         /// <param name="probability">The calculated probability.</param>
-        /// <param name="assessmentSection">The assessment section this failure mechanism section belongs to.</param>
-        /// <param name="failureMechanism">The failure mechanism this failure mechanism section belongs to.</param>
+        /// <param name="assemblyCategoriesInput">The object containing the input parameters required to construct
+        /// the <see cref="AssessmentSection"/> and <see cref="FailureMechanism"/>.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <see cref="detailedAssessmentResult"/> is
         /// an invalid <see cref="DetailedAssessmentProbabilityOnlyResultType"/>.</exception>
@@ -75,25 +75,23 @@
         /// an error occurs when performing the assembly.</exception>
         FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult,
                                                                    double probability,
-                                                                   AssessmentSection assessmentSection,
-                                                                   FailureMechanism failureMechanism);
+                                                                   AssemblyCategoriesInput assemblyCategoriesInput);
 
         /// <summary>
         /// Assembles the detailed assessment based on the input parameters.
         /// </summary>
         /// <param name="detailedAssessmentResult">The <see cref="DetailedAssessmentProbabilityOnlyResultType"/> to assemble for.</param>
         /// <param name="probability">The calculated probability.</param>
         /// <param name="n">The 'N' parameter used to factor in the 'length effect'.</param>
-        /// <param name="assessmentSection">The assessment section this failure mechanism section belongs to.</param>
-        /// <param name="failureMechanism">The failure mechanism this failure mechanism section belongs to.</param>
+        /// <param name="assemblyCategoriesInput">The object containing the input parameters required to construct
+        /// the <see cref="AssessmentSection"/> and <see cref="FailureMechanism"/>.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="FailureMechanismSectionAssemblyCalculatorException">Thrown when
         /// an error occurs when performing the assembly.</exception>
         FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult,
                                                                    double probability,
                                                                    double n,
-                                                                   AssessmentSection assessmentSection,
-                                                                   FailureMechanism failureMechanism);
+                                                                   AssemblyCategoriesInput assemblyCategoriesInput);
 
         /// <summary>
         /// Assembles the detailed assessment based on the input parameters.
@@ -134,31 +132,29 @@
         /// <param name="tailorMadeAssessmentResult">The <see cref="TailorMadeAssessmentProbabilityAndDetailedCalculationResultType"/>
         /// to assemble for.</param>
         /// <param name="probability">The calculated probability.</param>
-        /// <param name="assessmentSection">The assessment section this failure mechanism section belongs to.</param>
-        /// <param name="failureMechanism">The failure mechanism this failure mechanism section belongs to.</param>
+        /// <param name="assemblyCategoriesInput">The object containing the input parameters required to construct
+        /// the <see cref="AssessmentSection"/> and <see cref="FailureMechanism"/>.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="FailureMechanismSectionAssemblyCalculatorException">Thrown when
         /// an error occurs when performing the assembly.</exception>
         FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult,
                                                                      double probability,
-                                                                     AssessmentSection assessmentSection,
-                                                                     FailureMechanism failureMechanism);
+                                                                     AssemblyCategoriesInput assemblyCategoriesInput);
 
         /// <summary>
         /// Assembles the tailor made assessment based on the input parameters.
         /// </summary>
         /// <param name="tailorMadeAssessmentResult">The <see cref="TailorMadeAssessmentProbabilityCalculationResultType"/>
         /// to assemble for.</param>
         /// <param name="probability">The calculated probability.</param>
-        /// <param name="assessmentSection">The assessment section this failure mechanism section belongs to.</param>
-        /// <param name="failureMechanism">The failure mechanism this failure mechanism section belongs to.</param>
+        /// <param name="assemblyCategoriesInput">The object containing the input parameters required to construct
+        /// the <see cref="AssessmentSection"/> and <see cref="FailureMechanism"/>.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="FailureMechanismSectionAssemblyCalculatorException">Thrown when
         /// an error occurs when performing the assembly.</exception>
         FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult,
                                                                      double probability,
-                                                                     AssessmentSection assessmentSection,
-                                                                     FailureMechanism failureMechanism);
+                                                                     AssemblyCategoriesInput assemblyCategoriesInput);
 
         /// <summary>
         /// Assembles the tailor made assessment based on the input parameters.
@@ -167,16 +163,15 @@
         /// to assemble for.</param>
         /// <param name="probability">The calculated probability.</param>
         /// <param name="n">The 'N' parameter used to factor in the 'length effect'.</param>
-        /// <param name="assessmentSection">The assessment section this failure mechanism section belongs to.</param>
-        /// <param name="failureMechanism">The failure mechanism this failure mechanism section belongs to.</param>
+        /// <param name="assemblyCategoriesInput">The object containing the input parameters required to construct
+        /// the <see cref="AssessmentSection"/> and <see cref="FailureMechanism"/>.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="FailureMechanismSectionAssemblyCalculatorException">Thrown when
         /// an error occurs when performing the assembly.</exception>
         FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult,
                                                                      double probability,
                                                                      double n,
-                                                                     AssessmentSection assessmentSection,
-                                                                     FailureMechanism failureMechanism);
+                                                                     AssemblyCategoriesInput assemblyCategoriesInput);
 
         /// <summary>
         /// Assembles the tailor made assessment based on the input parameters.
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -r13a3e8b7103bb3f7ce45d52d51987c77b9191816 -rebf1043695f8e56bb1e0659af3565344f70cd33f
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 13a3e8b7103bb3f7ce45d52d51987c77b9191816)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision ebf1043695f8e56bb1e0659af3565344f70cd33f)
@@ -497,8 +497,7 @@
                 TestDelegate test = () => calculator.AssembleDetailedAssessment(
                     (DetailedAssessmentProbabilityOnlyResultType) 99,
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -508,17 +507,24 @@
             }
         }
 
+        private AssemblyCategoriesInput CreateAssemblyCategoriesInput()
+        {
+            var random = new Random(39);
+            return new AssemblyCategoriesInput(random.NextDouble(1.0, 5.0),
+                                               random.NextDouble(),
+                                               random.NextDouble(0.0, 0.5),
+                                               random.NextDouble(0.5, 1.0));
+        }
+
         [Test]
         public void AssembleDetailedAssessment_WithValidInput_InputCorrectlySetToKernel()
         {
             // Setup
             var random = new Random(39);
             double probability = random.NextDouble();
             var detailedAssessment = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
+            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
-
             using (new AssemblyToolKernelFactoryConfig())
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
@@ -532,17 +538,24 @@
                 calculator.AssembleDetailedAssessment(
                     detailedAssessment,
                     probability,
-                    assessmentSection,
-                    failureMechanism);
+                    assemblyCategoriesInput);
 
                 // Assert
                 Assert.AreEqual(probability, kernel.FailureProbabilityInput);
                 Assert.AreEqual(GetAssessmentResultTypeG2(detailedAssessment), kernel.AssessmentResultTypeG2Input);
-                Assert.AreSame(assessmentSection, kernel.AssessmentSectionInput);
-                Assert.AreSame(failureMechanism, kernel.FailureMechanismInput);
+
+                AssertAssemblyCategoriesInput(assemblyCategoriesInput, kernel);
             }
         }
 
+        private static void AssertAssemblyCategoriesInput(AssemblyCategoriesInput assemblyCategoriesInput, FailureMechanismSectionAssemblyKernelStub kernel)
+        {
+            Assert.AreEqual(assemblyCategoriesInput.N, kernel.FailureMechanismInput.LengthEffectFactor);
+            Assert.AreEqual(assemblyCategoriesInput.FailureMechanismContribution, kernel.FailureMechanismInput.FailureProbabilityMarginFactor);
+            Assert.AreEqual(assemblyCategoriesInput.LowerLimitNorm, kernel.AssessmentSectionInput.FailureProbabilityLowerLimit);
+            Assert.AreEqual(assemblyCategoriesInput.SignalingNorm, kernel.AssessmentSectionInput.FailureProbabilitySignallingLimit);
+        }
+
         [Test]
         public void AssembleDetailedAssessment_KernelWithCompleteOutput_OutputCorrectlyReturnedByCalculator()
         {
@@ -561,8 +574,7 @@
                 FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment(
                     random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResult, assembly);
@@ -587,8 +599,7 @@
                 TestDelegate test = () => calculator.AssembleDetailedAssessment(
                     random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -615,8 +626,7 @@
                 TestDelegate test = () => calculator.AssembleDetailedAssessment(
                     random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -641,8 +651,7 @@
                     (DetailedAssessmentProbabilityOnlyResultType) 99,
                     random.NextDouble(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -660,10 +669,8 @@
             double probability = random.NextDouble();
             double n = random.NextDouble();
             var detailedAssessment = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
+            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
-
             using (new AssemblyToolKernelFactoryConfig())
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
@@ -678,15 +685,13 @@
                     detailedAssessment,
                     probability,
                     n,
-                    assessmentSection,
-                    failureMechanism);
+                    assemblyCategoriesInput);
 
                 // Assert
                 Assert.AreEqual(probability, kernel.FailureProbabilityInput);
                 Assert.AreEqual(n, kernel.LengthEffectFactorInput);
                 Assert.AreEqual(GetAssessmentResultTypeG2(detailedAssessment), kernel.AssessmentResultTypeG2Input);
-                Assert.AreSame(assessmentSection, kernel.AssessmentSectionInput);
-                Assert.AreSame(failureMechanism, kernel.FailureMechanismInput);
+                AssertAssemblyCategoriesInput(assemblyCategoriesInput, kernel);
             }
         }
 
@@ -709,8 +714,7 @@
                     random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>(),
                     random.NextDouble(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResult, assembly);
@@ -736,8 +740,7 @@
                     random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>(),
                     random.NextDouble(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -765,8 +768,7 @@
                     random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>(),
                     random.NextDouble(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -1113,8 +1115,7 @@
                 TestDelegate test = () => calculator.AssembleTailorMadeAssessment(
                     (TailorMadeAssessmentProbabilityAndDetailedCalculationResultType) 99,
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -1131,8 +1132,7 @@
             var random = new Random(39);
             var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>();
             double probability = random.NextDouble();
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
             using (new AssemblyToolKernelFactoryConfig())
             {
@@ -1144,13 +1144,12 @@
                 var calculator = new FailureMechanismSectionAssemblyCalculator(factory);
 
                 // Call
-                calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, assessmentSection, failureMechanism);
+                calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, assemblyCategoriesInput);
 
                 // Assert
                 Assert.AreEqual(GetAssessmentResultTypeT4(tailorMadeAssessmentResult), kernel.AssessmentResultTypeT4Input);
                 Assert.AreEqual(probability, kernel.FailureProbabilityInput);
-                Assert.AreSame(assessmentSection, kernel.AssessmentSectionInput);
-                Assert.AreSame(failureMechanism, kernel.FailureMechanismInput);
+                AssertAssemblyCategoriesInput(assemblyCategoriesInput, kernel);
             }
         }
 
@@ -1172,8 +1171,7 @@
                 FailureMechanismSectionAssembly assembly = calculator.AssembleTailorMadeAssessment(
                     random.NextEnumValue<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResult, assembly);
@@ -1198,8 +1196,7 @@
                 TestDelegate test = () => calculator.AssembleTailorMadeAssessment(
                     random.NextEnumValue<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -1226,8 +1223,7 @@
                 TestDelegate test = () => calculator.AssembleTailorMadeAssessment(
                     random.NextEnumValue<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -1251,8 +1247,7 @@
                 TestDelegate test = () => calculator.AssembleTailorMadeAssessment(
                     (TailorMadeAssessmentProbabilityCalculationResultType) 99,
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -1269,8 +1264,7 @@
             var random = new Random(39);
             var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>();
             double probability = random.NextDouble();
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
             using (new AssemblyToolKernelFactoryConfig())
             {
@@ -1282,13 +1276,12 @@
                 var calculator = new FailureMechanismSectionAssemblyCalculator(factory);
 
                 // Call
-                calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, assessmentSection, failureMechanism);
+                calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, assemblyCategoriesInput);
 
                 // Assert
                 Assert.AreEqual(GetAssessmentResultTypeT3(tailorMadeAssessmentResult), kernel.AssessmentResultTypeT3Input);
                 Assert.AreEqual(probability, kernel.FailureProbabilityInput);
-                Assert.AreSame(assessmentSection, kernel.AssessmentSectionInput);
-                Assert.AreSame(failureMechanism, kernel.FailureMechanismInput);
+                AssertAssemblyCategoriesInput(assemblyCategoriesInput, kernel);
             }
         }
 
@@ -1310,8 +1303,7 @@
                 FailureMechanismSectionAssembly assembly = calculator.AssembleTailorMadeAssessment(
                     random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResult, assembly);
@@ -1336,8 +1328,7 @@
                 TestDelegate test = () => calculator.AssembleTailorMadeAssessment(
                     random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -1364,8 +1355,7 @@
                 TestDelegate test = () => calculator.AssembleTailorMadeAssessment(
                     random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -1390,8 +1380,7 @@
                     (TailorMadeAssessmentProbabilityCalculationResultType) 99,
                     random.NextDouble(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -1409,8 +1398,7 @@
             var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>();
             double probability = random.NextDouble();
             double n = random.NextDouble();
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
             using (new AssemblyToolKernelFactoryConfig())
             {
@@ -1422,14 +1410,13 @@
                 var calculator = new FailureMechanismSectionAssemblyCalculator(factory);
 
                 // Call
-                calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, n, assessmentSection, failureMechanism);
+                calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, n, assemblyCategoriesInput);
 
                 // Assert
                 Assert.AreEqual(GetAssessmentResultTypeT3(tailorMadeAssessmentResult), kernel.AssessmentResultTypeT3Input);
                 Assert.AreEqual(probability, kernel.FailureProbabilityInput);
                 Assert.AreEqual(n, kernel.LengthEffectFactorInput);
-                Assert.AreSame(assessmentSection, kernel.AssessmentSectionInput);
-                Assert.AreSame(failureMechanism, kernel.FailureMechanismInput);
+                AssertAssemblyCategoriesInput(assemblyCategoriesInput, kernel);
             }
         }
 
@@ -1452,8 +1439,7 @@
                     random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                     random.NextDouble(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResult, assembly);
@@ -1479,8 +1465,7 @@
                     random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                     random.NextDouble(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -1508,8 +1493,7 @@
                     random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                     random.NextDouble(),
                     random.NextDouble(),
-                    new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                    new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                    CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs
===================================================================
diff -u -rc272e050676c973bfa102b51a80a4fc8a20c8de2 -rebf1043695f8e56bb1e0659af3565344f70cd33f
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs	(.../FailureMechanismSectionAssemblyCalculatorStubTest.cs)	(revision c272e050676c973bfa102b51a80a4fc8a20c8de2)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs	(.../FailureMechanismSectionAssemblyCalculatorStubTest.cs)	(revision ebf1043695f8e56bb1e0659af3565344f70cd33f)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Assembly.Kernel.Model;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
@@ -45,8 +44,6 @@
             Assert.AreEqual((SimpleAssessmentValidityOnlyResultType) 0, calculator.SimpleAssessmentValidityOnlyInput);
             Assert.IsNull(calculator.SimpleAssessmentAssemblyOutput);
 
-            Assert.IsNull(calculator.DetailedAssessmentAssessmentSectionInput);
-            Assert.IsNull(calculator.DetailedAssessmentFailureMechanismInput);
             Assert.AreEqual(0.0, calculator.DetailedAssessmentNInput);
             Assert.AreEqual(0.0, calculator.DetailedAssessmentProbabilityInput);
             Assert.AreEqual((DetailedAssessmentProbabilityOnlyResultType) 0, calculator.DetailedAssessmentProbabilityOnlyResultInput);
@@ -59,8 +56,6 @@
             Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssessmentResultForFactorizedLowerLimitNormInput);
             Assert.IsNull(calculator.DetailedAssessmentAssemblyGroupOutput);
 
-            Assert.IsNull(calculator.TailorMadeAssessmentAssessmentSectionInput);
-            Assert.IsNull(calculator.TailorMadeAssessmentFailureMechanismInput);
             Assert.AreEqual(0.0, calculator.TailorMadeAssessmentProbabilityInput);
 
             Assert.AreEqual((TailorMadeAssessmentProbabilityAndDetailedCalculationResultType) 0,
@@ -73,8 +68,19 @@
             Assert.IsNull(calculator.CombinedDetailedAssemblyInput);
             Assert.IsNull(calculator.CombinedTailorMadeAssemblyInput);
             Assert.IsNull(calculator.CombinedAssemblyOutput);
+
+            Assert.IsNull(calculator.AssemblyCategoriesInput);
         }
 
+        private AssemblyCategoriesInput CreateAssemblyCategoriesInput()
+        {
+            var random = new Random(39);
+            return new AssemblyCategoriesInput(random.NextDouble(),
+                                               random.NextDouble(),
+                                               random.NextDouble(),
+                                               random.NextDouble());
+        }
+
         #region Simple Assessment
 
         [Test]
@@ -288,8 +294,7 @@
             FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment(
                 random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>(),
                 random.NextDouble(),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             Assert.AreEqual(1.0, assembly.Probability);
@@ -312,8 +317,7 @@
             FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment(
                 random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>(),
                 random.NextDouble(),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             Assert.AreSame(calculator.DetailedAssessmentAssemblyOutput, assembly);
@@ -326,19 +330,17 @@
             var random = new Random(39);
             double probability = random.NextDouble();
             var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
             var calculator = new FailureMechanismSectionAssemblyCalculatorStub();
 
             // Call
-            calculator.AssembleDetailedAssessment(detailedAssessmentResult, probability, assessmentSection, failureMechanism);
+            calculator.AssembleDetailedAssessment(detailedAssessmentResult, probability, assemblyCategoriesInput);
 
             // Assert
             Assert.AreEqual(detailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput);
             Assert.AreEqual(probability, calculator.DetailedAssessmentProbabilityInput);
-            Assert.AreSame(assessmentSection, calculator.DetailedAssessmentAssessmentSectionInput);
-            Assert.AreSame(failureMechanism, calculator.DetailedAssessmentFailureMechanismInput);
+            Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput);
         }
 
         [Test]
@@ -355,8 +357,7 @@
             TestDelegate test = () => calculator.AssembleDetailedAssessment(
                 random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>(),
                 random.NextDouble(),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -376,8 +377,7 @@
                 random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>(),
                 random.NextDouble(),
                 random.NextRoundedDouble(1.0, 10.0),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             Assert.AreEqual(0.0, assembly.Probability);
@@ -401,8 +401,7 @@
                 random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>(),
                 random.NextDouble(),
                 random.NextRoundedDouble(1.0, 10.0),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             Assert.AreSame(calculator.DetailedAssessmentAssemblyOutput, assembly);
@@ -416,20 +415,18 @@
             double probability = random.NextDouble();
             double n = random.NextRoundedDouble(1.0, 10.0);
             var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
             var calculator = new FailureMechanismSectionAssemblyCalculatorStub();
 
             // Call
-            calculator.AssembleDetailedAssessment(detailedAssessmentResult, probability, n, assessmentSection, failureMechanism);
+            calculator.AssembleDetailedAssessment(detailedAssessmentResult, probability, n, assemblyCategoriesInput);
 
             // Assert
             Assert.AreEqual(detailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput);
             Assert.AreEqual(probability, calculator.DetailedAssessmentProbabilityInput);
             Assert.AreEqual(n, calculator.DetailedAssessmentNInput);
-            Assert.AreSame(assessmentSection, calculator.DetailedAssessmentAssessmentSectionInput);
-            Assert.AreSame(failureMechanism, calculator.DetailedAssessmentFailureMechanismInput);
+            Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput);
         }
 
         [Test]
@@ -447,8 +444,7 @@
                 random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>(),
                 random.NextDouble(),
                 random.NextRoundedDouble(1.0, 10.0),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -630,8 +626,7 @@
             FailureMechanismSectionAssembly assembly = calculator.AssembleTailorMadeAssessment(
                 random.NextEnumValue<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>(),
                 random.NextDouble(),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             Assert.AreEqual(1.0, assembly.Probability);
@@ -654,8 +649,7 @@
             FailureMechanismSectionAssembly assembly = calculator.AssembleTailorMadeAssessment(
                 random.NextEnumValue<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>(),
                 random.NextDouble(),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             Assert.AreSame(calculator.TailorMadeAssessmentAssemblyOutput, assembly);
@@ -668,19 +662,17 @@
             var random = new Random(39);
             double probability = random.NextDouble();
             var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>();
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
             var calculator = new FailureMechanismSectionAssemblyCalculatorStub();
 
             // Call
-            calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, assessmentSection, failureMechanism);
+            calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, assemblyCategoriesInput);
 
             // Assert
             Assert.AreEqual(tailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityAndDetailedCalculationResultInput);
             Assert.AreEqual(probability, calculator.TailorMadeAssessmentProbabilityInput);
-            Assert.AreSame(assessmentSection, calculator.TailorMadeAssessmentAssessmentSectionInput);
-            Assert.AreSame(failureMechanism, calculator.TailorMadeAssessmentFailureMechanismInput);
+            Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput);
         }
 
         [Test]
@@ -697,8 +689,7 @@
             TestDelegate test = () => calculator.AssembleTailorMadeAssessment(
                 random.NextEnumValue<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>(),
                 random.NextDouble(),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -717,8 +708,7 @@
             FailureMechanismSectionAssembly assembly = calculator.AssembleTailorMadeAssessment(
                 random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                 random.NextDouble(),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             Assert.AreEqual(1.0, assembly.Probability);
@@ -741,8 +731,7 @@
             FailureMechanismSectionAssembly assembly = calculator.AssembleTailorMadeAssessment(
                 random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                 random.NextDouble(),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             Assert.AreSame(calculator.TailorMadeAssessmentAssemblyOutput, assembly);
@@ -755,19 +744,17 @@
             var random = new Random(39);
             double probability = random.NextDouble();
             var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>();
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
             var calculator = new FailureMechanismSectionAssemblyCalculatorStub();
 
             // Call
-            calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, assessmentSection, failureMechanism);
+            calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, assemblyCategoriesInput);
 
             // Assert
             Assert.AreEqual(tailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput);
             Assert.AreEqual(probability, calculator.TailorMadeAssessmentProbabilityInput);
-            Assert.AreSame(assessmentSection, calculator.TailorMadeAssessmentAssessmentSectionInput);
-            Assert.AreSame(failureMechanism, calculator.TailorMadeAssessmentFailureMechanismInput);
+            Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput);
         }
 
         [Test]
@@ -784,8 +771,7 @@
             TestDelegate test = () => calculator.AssembleTailorMadeAssessment(
                 random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                 random.NextDouble(),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
@@ -805,8 +791,7 @@
                 random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                 random.NextDouble(),
                 random.NextDouble(),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             Assert.AreEqual(1.0, assembly.Probability);
@@ -830,8 +815,7 @@
                 random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                 random.NextDouble(),
                 random.NextDouble(),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             Assert.AreSame(calculator.TailorMadeAssessmentAssemblyOutput, assembly);
@@ -845,20 +829,18 @@
             double probability = random.NextDouble();
             double n = random.NextDouble();
             var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>();
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
             var calculator = new FailureMechanismSectionAssemblyCalculatorStub();
 
             // Call
-            calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, n, assessmentSection, failureMechanism);
+            calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, n, assemblyCategoriesInput);
 
             // Assert
             Assert.AreEqual(tailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput);
             Assert.AreEqual(probability, calculator.TailorMadeAssessmentProbabilityInput);
             Assert.AreEqual(n, calculator.TailorMadeAssessmentNInput);
-            Assert.AreSame(assessmentSection, calculator.TailorMadeAssessmentAssessmentSectionInput);
-            Assert.AreSame(failureMechanism, calculator.TailorMadeAssessmentFailureMechanismInput);
+            Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput);
         }
 
         [Test]
@@ -876,8 +858,7 @@
                 random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                 random.NextDouble(),
                 random.NextDouble(),
-                new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.4), random.NextDouble(0.5, 0.9)),
-                new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()));
+                CreateAssemblyCategoriesInput());
 
             // Assert
             var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(test);
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs
===================================================================
diff -u -r13a3e8b7103bb3f7ce45d52d51987c77b9191816 -rebf1043695f8e56bb1e0659af3565344f70cd33f
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs	(.../FailureMechanismSectionAssemblyCalculatorStub.cs)	(revision 13a3e8b7103bb3f7ce45d52d51987c77b9191816)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs	(.../FailureMechanismSectionAssemblyCalculatorStub.cs)	(revision ebf1043695f8e56bb1e0659af3565344f70cd33f)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Assembly.Kernel.Model;
 using Ringtoets.AssemblyTool.Data;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Ringtoets.Common.Primitives;
@@ -73,16 +72,6 @@
         public double DetailedAssessmentProbabilityInput { get; private set; }
 
         /// <summary>
-        /// Gets the assessment section input of the detailed assessment calculation.
-        /// </summary>
-        public AssessmentSection DetailedAssessmentAssessmentSectionInput { get; private set; }
-
-        /// <summary>
-        /// Gets the failure mechanism input of the detailed assessment calculation.
-        /// </summary>
-        public FailureMechanism DetailedAssessmentFailureMechanismInput { get; private set; }
-
-        /// <summary>
         /// Gets the 'N' parameter input of the detailed assessment calculation.
         /// </summary>
         public double DetailedAssessmentNInput { get; private set; }
@@ -138,16 +127,6 @@
         public double TailorMadeAssessmentProbabilityInput { get; private set; }
 
         /// <summary>
-        /// Gets the assessment section input of the tailor made assessment calculation.
-        /// </summary>
-        public AssessmentSection TailorMadeAssessmentAssessmentSectionInput { get; private set; }
-
-        /// <summary>
-        /// Gets the failure mechanism input of the tailor made assessment calculation.
-        /// </summary>
-        public FailureMechanism TailorMadeAssessmentFailureMechanismInput { get; private set; }
-
-        /// <summary>
         /// Gets the 'N' parameter input of the tailor made assessment calculation.
         /// </summary>
         public double TailorMadeAssessmentNInput { get; private set; }
@@ -203,6 +182,11 @@
         public FailureMechanismSectionAssemblyCategoryGroup CombinedTailorMadeAssemblyGroupInput { get; private set; }
 
         /// <summary>
+        /// Gets the assembly categories input used in the assembly calculation methods.
+        /// </summary>
+        public AssemblyCategoriesInput AssemblyCategoriesInput { get; private set; }
+
+        /// <summary>
         /// Sets an indicator whether an exception must be thrown when performing a calculation.
         /// </summary>
         public bool ThrowExceptionOnCalculate { private get; set; }
@@ -257,8 +241,7 @@
 
         public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult,
                                                                           double probability,
-                                                                          AssessmentSection assessmentSection,
-                                                                          FailureMechanism failureMechanism)
+                                                                          AssemblyCategoriesInput assemblyCategoriesInput)
         {
             if (ThrowExceptionOnCalculate)
             {
@@ -267,8 +250,7 @@
 
             DetailedAssessmentProbabilityOnlyResultInput = detailedAssessmentResult;
             DetailedAssessmentProbabilityInput = probability;
-            DetailedAssessmentAssessmentSectionInput = assessmentSection;
-            DetailedAssessmentFailureMechanismInput = failureMechanism;
+            AssemblyCategoriesInput = assemblyCategoriesInput;
 
             return DetailedAssessmentAssemblyOutput ??
                    (DetailedAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv));
@@ -277,8 +259,7 @@
         public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult,
                                                                           double probability,
                                                                           double n,
-                                                                          AssessmentSection assessmentSection,
-                                                                          FailureMechanism failureMechanism)
+                                                                          AssemblyCategoriesInput assemblyCategoriesInput)
         {
             if (ThrowExceptionOnCalculate)
             {
@@ -287,8 +268,7 @@
 
             DetailedAssessmentProbabilityOnlyResultInput = detailedAssessmentResult;
             DetailedAssessmentProbabilityInput = probability;
-            DetailedAssessmentAssessmentSectionInput = assessmentSection;
-            DetailedAssessmentFailureMechanismInput = failureMechanism;
+            AssemblyCategoriesInput = assemblyCategoriesInput;
             DetailedAssessmentNInput = n;
 
             return DetailedAssessmentAssemblyOutput ??
@@ -340,8 +320,7 @@
 
         public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult,
                                                                             double probability,
-                                                                            AssessmentSection assessmentSection,
-                                                                            FailureMechanism failureMechanism)
+                                                                            AssemblyCategoriesInput assemblyCategoriesInput)
         {
             if (ThrowExceptionOnCalculate)
             {
@@ -350,17 +329,15 @@
 
             TailorMadeAssessmentProbabilityAndDetailedCalculationResultInput = tailorMadeAssessmentResult;
             TailorMadeAssessmentProbabilityInput = probability;
-            TailorMadeAssessmentAssessmentSectionInput = assessmentSection;
-            TailorMadeAssessmentFailureMechanismInput = failureMechanism;
+            AssemblyCategoriesInput = assemblyCategoriesInput;
 
             return TailorMadeAssessmentAssemblyOutput ??
                    (TailorMadeAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv));
         }
 
         public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult,
                                                                             double probability,
-                                                                            AssessmentSection assessmentSection,
-                                                                            FailureMechanism failureMechanism)
+                                                                            AssemblyCategoriesInput assemblyCategoriesInput)
         {
             if (ThrowExceptionOnCalculate)
             {
@@ -369,8 +346,7 @@
 
             TailorMadeAssessmentProbabilityCalculationResultInput = tailorMadeAssessmentResult;
             TailorMadeAssessmentProbabilityInput = probability;
-            TailorMadeAssessmentAssessmentSectionInput = assessmentSection;
-            TailorMadeAssessmentFailureMechanismInput = failureMechanism;
+            AssemblyCategoriesInput = assemblyCategoriesInput;
 
             return TailorMadeAssessmentAssemblyOutput ??
                    (TailorMadeAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv));
@@ -379,8 +355,7 @@
         public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult,
                                                                             double probability,
                                                                             double n,
-                                                                            AssessmentSection assessmentSection,
-                                                                            FailureMechanism failureMechanism)
+                                                                            AssemblyCategoriesInput assemblyCategoriesInput)
         {
             if (ThrowExceptionOnCalculate)
             {
@@ -389,8 +364,7 @@
 
             TailorMadeAssessmentProbabilityCalculationResultInput = tailorMadeAssessmentResult;
             TailorMadeAssessmentProbabilityInput = probability;
-            TailorMadeAssessmentAssessmentSectionInput = assessmentSection;
-            TailorMadeAssessmentFailureMechanismInput = failureMechanism;
+            AssemblyCategoriesInput = assemblyCategoriesInput;
             TailorMadeAssessmentNInput = n;
 
             return TailorMadeAssessmentAssemblyOutput ??