Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rebf5c9d3fb7325b7ff81c88e771a415e60c151e7 -rca941595ed8f298fda9bad3c0851bdbd94e180c2
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision ebf5c9d3fb7325b7ff81c88e771a415e60c151e7)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision ca941595ed8f298fda9bad3c0851bdbd94e180c2)
@@ -378,6 +378,18 @@
             {
                 CreateInstance = context => new ReferenceLineProperties(context.WrappedData)
             };
+            yield return new PropertyInfo<GeotechnicalFailureMechanismAssemblyCategoriesContext, GeotechnicFailureMechanismAssemblyCategoriesProperties>
+            {
+                CreateInstance = context => new GeotechnicFailureMechanismAssemblyCategoriesProperties(context.WrappedData,
+                                                                                                       context.AssessmentSection,
+                                                                                                       context.GetNFunc)
+            };
+            yield return new PropertyInfo<FailureMechanismAssemblyCategoriesContext, FailureMechanismAssemblyCategoriesProperties>
+            {
+                CreateInstance = context => new FailureMechanismAssemblyCategoriesProperties(context.WrappedData,
+                                                                                             context.AssessmentSection,
+                                                                                             context.GetNFunc)
+            };
         }
 
         /// <summary>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismAssemblyCategoriesPropertyInfoTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismAssemblyCategoriesPropertyInfoTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismAssemblyCategoriesPropertyInfoTest.cs	(revision ca941595ed8f298fda9bad3c0851bdbd94e180c2)
@@ -0,0 +1,81 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Linq;
+using Core.Common.Gui.Plugin;
+using Core.Common.Gui.PropertyBag;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.Forms.PropertyClasses;
+
+namespace Ringtoets.Integration.Plugin.Test.PropertyInfos
+{
+    [TestFixture]
+    public class FailureMechanismAssemblyCategoriesPropertyInfoTest
+    {
+        private RingtoetsPlugin plugin;
+        private PropertyInfo info;
+
+        [SetUp]
+        public void SetUp()
+        {
+            plugin = new RingtoetsPlugin();
+            info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(FailureMechanismAssemblyCategoriesProperties));
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            plugin.Dispose();
+        }
+
+        [Test]
+        public void Initialized_Always_ExpectedPropertiesSet()
+        {
+            // Assert
+            Assert.AreEqual(typeof(FailureMechanismAssemblyCategoriesContext), info.DataType);
+        }
+
+        [Test]
+        public void CreateInstance_ValidArguments_ReturnProperties()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context = new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => 0.01);
+
+            // Call
+            IObjectProperties objectProperties = info.CreateInstance(context);
+
+            // Assert
+            Assert.IsInstanceOf<FailureMechanismAssemblyCategoriesProperties>(objectProperties);
+            Assert.AreSame(failureMechanism, objectProperties.Data);
+
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/GeotechnicalFailureMechanismAssemblyCategoriesPropertyInfoTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/GeotechnicalFailureMechanismAssemblyCategoriesPropertyInfoTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/GeotechnicalFailureMechanismAssemblyCategoriesPropertyInfoTest.cs	(revision ca941595ed8f298fda9bad3c0851bdbd94e180c2)
@@ -0,0 +1,81 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Linq;
+using Core.Common.Gui.Plugin;
+using Core.Common.Gui.PropertyBag;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.Forms.PropertyClasses;
+
+namespace Ringtoets.Integration.Plugin.Test.PropertyInfos
+{
+    [TestFixture]
+    public class GeotechnicalFailureMechanismAssemblyCategoriesPropertyInfoTest
+    {
+        private RingtoetsPlugin plugin;
+        private PropertyInfo info;
+
+        [SetUp]
+        public void SetUp()
+        {
+            plugin = new RingtoetsPlugin();
+            info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(GeotechnicFailureMechanismAssemblyCategoriesProperties));
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            plugin.Dispose();
+        }
+
+        [Test]
+        public void Initialized_Always_ExpectedPropertiesSet()
+        {
+            // Assert
+            Assert.AreEqual(typeof(GeotechnicalFailureMechanismAssemblyCategoriesContext), info.DataType);
+        }
+
+        [Test]
+        public void CreateInstance_ValidArguments_ReturnProperties()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context = new GeotechnicalFailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => 0.01);
+
+            // Call
+            IObjectProperties objectProperties = info.CreateInstance(context);
+
+            // Assert
+            Assert.IsInstanceOf<GeotechnicFailureMechanismAssemblyCategoriesProperties>(objectProperties);
+            Assert.AreSame(failureMechanism, objectProperties.Data);
+
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -r83fd28633f7ee5404dc1aa961c6aa00ae6bbbe22 -rca941595ed8f298fda9bad3c0851bdbd94e180c2
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 83fd28633f7ee5404dc1aa961c6aa00ae6bbbe22)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision ca941595ed8f298fda9bad3c0851bdbd94e180c2)
@@ -48,6 +48,8 @@
     <Compile Include="ImportInfos\ReferenceLineContextImportInfoTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyInfos\BackgroundDataPropertyInfoTest .cs" />
+    <Compile Include="PropertyInfos\GeotechnicalFailureMechanismAssemblyCategoriesPropertyInfoTest.cs" />
+    <Compile Include="PropertyInfos\FailureMechanismAssemblyCategoriesPropertyInfoTest.cs" />
     <Compile Include="PropertyInfos\NormContextPropertyInfoTest.cs" />
     <Compile Include="PropertyInfos\WaveHeightCalculationContextPropertyInfoTest.cs" />
     <Compile Include="PropertyInfos\DesignWaterLevelCalculationContextPropertyInfoTest.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -rebf5c9d3fb7325b7ff81c88e771a415e60c151e7 -rca941595ed8f298fda9bad3c0851bdbd94e180c2
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision ebf5c9d3fb7325b7ff81c88e771a415e60c151e7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision ca941595ed8f298fda9bad3c0851bdbd94e180c2)
@@ -221,7 +221,7 @@
                 PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(23, propertyInfos.Length);
+                Assert.AreEqual(25, propertyInfos.Length);
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
@@ -337,6 +337,16 @@
                     propertyInfos,
                     typeof(ReferenceLineContext),
                     typeof(ReferenceLineProperties));
+
+                PluginTestHelper.AssertPropertyInfoDefined(
+                    propertyInfos,
+                    typeof(FailureMechanismAssemblyCategoriesContext),
+                    typeof(FailureMechanismAssemblyCategoriesProperties));
+
+                PluginTestHelper.AssertPropertyInfoDefined(
+                    propertyInfos,
+                    typeof(GeotechnicalFailureMechanismAssemblyCategoriesContext),
+                    typeof(GeotechnicFailureMechanismAssemblyCategoriesProperties));
             }
         }