Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj
===================================================================
diff -u -ra57fa7943b448178d966241987678c2f0b28c32e -r0ebcd2c2000e767623f8eada05f920af400d5530
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision a57fa7943b448178d966241987678c2f0b28c32e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision 0ebcd2c2000e767623f8eada05f920af400d5530)
@@ -77,6 +77,11 @@
       <Name>Core.Components.Gis</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Ringtoets.AssemblyTool.Data\Ringtoets.AssemblyTool.Data.csproj">
+      <Project>{420ed9c3-0c33-47ea-b893-121a9c0db4f1}</Project>
+      <Name>Ringtoets.AssemblyTool.Data</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\ClosingStructures\src\Ringtoets.ClosingStructures.Data\Ringtoets.ClosingStructures.Data.csproj">
       <Project>{C6309704-D67B-434C-BC98-9F8910BC1D10}</Project>
       <Name>Ringtoets.ClosingStructures.Data</Name>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rd75cba7f33dd4264452ed4dcceddd5ec79b210ea -r0ebcd2c2000e767623f8eada05f920af400d5530
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision d75cba7f33dd4264452ed4dcceddd5ec79b210ea)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 0ebcd2c2000e767623f8eada05f920af400d5530)
@@ -378,17 +378,17 @@
             {
                 CreateInstance = context => new ReferenceLineProperties(context.WrappedData)
             };
-            yield return new PropertyInfo<GeotechnicalFailureMechanismAssemblyCategoriesContext, GeotechnicalFailureMechanismAssemblyCategoriesProperties>
+            yield return new PropertyInfo<GeotechnicalFailureMechanismAssemblyCategoriesContext, FailureMechanismAssemblyCategoriesBaseProperties>
             {
-                CreateInstance = context => new GeotechnicalFailureMechanismAssemblyCategoriesProperties(context.WrappedData,
-                                                                                                         context.AssessmentSection,
-                                                                                                         context.GetNFunc)
+                CreateInstance = context => new FailureMechanismAssemblyCategoriesBaseProperties(context.WrappedData,
+                                                                                                 context.GetFailureMechanismCategoriesFunc,
+                                                                                                 context.GetFailureMechanismSectionAssemblyCategoriesFunc)
             };
-            yield return new PropertyInfo<FailureMechanismAssemblyCategoriesContext, FailureMechanismAssemblyCategoriesProperties>
+            yield return new PropertyInfo<FailureMechanismAssemblyCategoriesContext, FailureMechanismAssemblyCategoriesBaseProperties>
             {
-                CreateInstance = context => new FailureMechanismAssemblyCategoriesProperties(context.WrappedData,
-                                                                                             context.AssessmentSection,
-                                                                                             context.GetNFunc)
+                CreateInstance = context => new FailureMechanismAssemblyCategoriesBaseProperties(context.WrappedData,
+                                                                                                 context.GetFailureMechanismCategoriesFunc,
+                                                                                                 context.GetFailureMechanismSectionAssemblyCategoriesFunc)
             };
         }
 
@@ -1703,9 +1703,9 @@
             var failureMechanismResultContexts = new object[3];
 
             failureMechanismResultContexts[0] =
-                new GeotechnicalFailureMechanismAssemblyCategoriesContext(nodeData,
-                                                                          assessmentSection,
-                                                                          () => nodeData.N);
+                new FailureMechanismAssemblyCategoriesContext(nodeData,
+                                                              assessmentSection,
+                                                              () => nodeData.N);
             failureMechanismResultContexts[1] =
                 new ProbabilityFailureMechanismSectionResultContext<PipingStructureFailureMechanismSectionResult>(
                     nodeData.SectionResults, nodeData, assessmentSection);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismAssemblyCategoriesPropertyInfoTest.cs
===================================================================
diff -u -rca941595ed8f298fda9bad3c0851bdbd94e180c2 -r0ebcd2c2000e767623f8eada05f920af400d5530
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismAssemblyCategoriesPropertyInfoTest.cs	(.../FailureMechanismAssemblyCategoriesPropertyInfoTest.cs)	(revision ca941595ed8f298fda9bad3c0851bdbd94e180c2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismAssemblyCategoriesPropertyInfoTest.cs	(.../FailureMechanismAssemblyCategoriesPropertyInfoTest.cs)	(revision 0ebcd2c2000e767623f8eada05f920af400d5530)
@@ -41,7 +41,8 @@
         public void SetUp()
         {
             plugin = new RingtoetsPlugin();
-            info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(FailureMechanismAssemblyCategoriesProperties));
+            info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(FailureMechanismAssemblyCategoriesBaseProperties)
+                                                          && tni.DataType == typeof(FailureMechanismAssemblyCategoriesContext));
         }
 
         [TearDown]
@@ -72,7 +73,7 @@
             IObjectProperties objectProperties = info.CreateInstance(context);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismAssemblyCategoriesProperties>(objectProperties);
+            Assert.IsInstanceOf<FailureMechanismAssemblyCategoriesBaseProperties>(objectProperties);
             Assert.AreSame(failureMechanism, objectProperties.Data);
 
             mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/GeotechnicalFailureMechanismAssemblyCategoriesPropertyInfoTest.cs
===================================================================
diff -u -rd75cba7f33dd4264452ed4dcceddd5ec79b210ea -r0ebcd2c2000e767623f8eada05f920af400d5530
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/GeotechnicalFailureMechanismAssemblyCategoriesPropertyInfoTest.cs	(.../GeotechnicalFailureMechanismAssemblyCategoriesPropertyInfoTest.cs)	(revision d75cba7f33dd4264452ed4dcceddd5ec79b210ea)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/GeotechnicalFailureMechanismAssemblyCategoriesPropertyInfoTest.cs	(.../GeotechnicalFailureMechanismAssemblyCategoriesPropertyInfoTest.cs)	(revision 0ebcd2c2000e767623f8eada05f920af400d5530)
@@ -41,7 +41,8 @@
         public void SetUp()
         {
             plugin = new RingtoetsPlugin();
-            info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(GeotechnicalFailureMechanismAssemblyCategoriesProperties));
+            info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(FailureMechanismAssemblyCategoriesBaseProperties)
+                                                          && tni.DataType == typeof(GeotechnicalFailureMechanismAssemblyCategoriesContext));
         }
 
         [TearDown]
@@ -72,7 +73,7 @@
             IObjectProperties objectProperties = info.CreateInstance(context);
 
             // Assert
-            Assert.IsInstanceOf<GeotechnicalFailureMechanismAssemblyCategoriesProperties>(objectProperties);
+            Assert.IsInstanceOf<FailureMechanismAssemblyCategoriesBaseProperties>(objectProperties);
             Assert.AreSame(failureMechanism, objectProperties.Data);
 
             mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -rca941595ed8f298fda9bad3c0851bdbd94e180c2 -r0ebcd2c2000e767623f8eada05f920af400d5530
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision ca941595ed8f298fda9bad3c0851bdbd94e180c2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 0ebcd2c2000e767623f8eada05f920af400d5530)
@@ -175,6 +175,14 @@
       <Project>{F0FB401A-3494-4237-9E6D-02CDF77912A8}</Project>
       <Name>Core.Components.Gis.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Ringtoets.AssemblyTool.Data\Ringtoets.AssemblyTool.Data.csproj">
+      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
+      <Name>Ringtoets.AssemblyTool.Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Ringtoets.AssemblyTool.KernelWrapper\Ringtoets.AssemblyTool.KernelWrapper.csproj">
+      <Project>{358B6DA2-A1DF-477F-B6AC-C30204265CB0}</Project>
+      <Name>Ringtoets.AssemblyTool.KernelWrapper</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\AssemblyTool\test\Ringtoets.AssemblyTool.KernelWrapper.TestUtil\Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj">
       <Project>{0AB432BB-E2CC-42EA-A72C-7AFEF7536B38}</Project>
       <Name>Ringtoets.AssemblyTool.KernelWrapper.TestUtil</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -rd75cba7f33dd4264452ed4dcceddd5ec79b210ea -r0ebcd2c2000e767623f8eada05f920af400d5530
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision d75cba7f33dd4264452ed4dcceddd5ec79b210ea)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 0ebcd2c2000e767623f8eada05f920af400d5530)
@@ -341,12 +341,12 @@
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(FailureMechanismAssemblyCategoriesContext),
-                    typeof(FailureMechanismAssemblyCategoriesProperties));
+                    typeof(FailureMechanismAssemblyCategoriesBaseProperties));
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GeotechnicalFailureMechanismAssemblyCategoriesContext),
-                    typeof(GeotechnicalFailureMechanismAssemblyCategoriesProperties));
+                    typeof(FailureMechanismAssemblyCategoriesBaseProperties));
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r31089c28777af00964e16b49b49fa2fff8311617 -r0ebcd2c2000e767623f8eada05f920af400d5530
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 31089c28777af00964e16b49b49fa2fff8311617)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 0ebcd2c2000e767623f8eada05f920af400d5530)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
@@ -32,10 +33,15 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.Input;
@@ -147,8 +153,7 @@
         public void ChildNodeObjects_FailureMechanismIsRelevant_ReturnChildDataNodes()
         {
             // Setup
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
+            var assessmentSection = new AssessmentSectionStub();
 
             var failureMechanism = new MacroStabilityOutwardsFailureMechanism();
 
@@ -174,12 +179,21 @@
             Assert.AreEqual(3, outputFolder.Contents.Count());
             Assert.AreEqual("Oordeel", outputFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
+
             var failureMechanismAssemblyCategoriesContext = (GeotechnicalFailureMechanismAssemblyCategoriesContext) outputFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
             Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
-            MacroStabilityOutwardsProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput;
-            Assert.AreEqual(probabilityAssessmentInput.GetN(probabilityAssessmentInput.SectionLength), failureMechanismAssemblyCategoriesContext.GetNFunc());
 
+            using (new AssemblyToolCalculatorFactoryConfig())
+            {
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
+                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
+
+                failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
+                MacroStabilityOutwardsProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput;
+                Assert.AreEqual(probabilityAssessmentInput.GetN(probabilityAssessmentInput.SectionLength), calculator.AssemblyCategoriesInput.N);
+            }
+
             var failureMechanismResultsContext = (FailureMechanismSectionResultContext<MacroStabilityOutwardsFailureMechanismSectionResult>)
                 outputFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);