Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/StandAloneFailureMechanismContextProperties.cs
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -rdaa1008263412accdb1fcad949ddf100fb2e97b7
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/StandAloneFailureMechanismContextProperties.cs	(.../StandAloneFailureMechanismContextProperties.cs)	(revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/StandAloneFailureMechanismContextProperties.cs	(.../StandAloneFailureMechanismContextProperties.cs)	(revision daa1008263412accdb1fcad949ddf100fb2e97b7)
@@ -1,14 +1,17 @@
 using Core.Common.Gui.Attributes;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PresentationObjects;
 
 namespace Ringtoets.Integration.Forms.PropertyClasses
 {
     /// <summary>
     /// ViewModel of <see cref="SimpleFailureMechanismContext"/> properties panel.
     /// </summary>
-    public class StandAloneFailureMechanismContextProperties : ObjectProperties<SimpleFailureMechanismContext> {
+    public class StandAloneFailureMechanismContextProperties : ObjectProperties<FailureMechanismContext<IFailureMechanism>>
+    {
 
         #region General
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r20bb156dfc129b1602ddbcddc73c0806807f19ab -rdaa1008263412accdb1fcad949ddf100fb2e97b7
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 20bb156dfc129b1602ddbcddc73c0806807f19ab)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision daa1008263412accdb1fcad949ddf100fb2e97b7)
@@ -107,7 +107,7 @@
         {
             yield return new PropertyInfo<IAssessmentSection, AssessmentSectionProperties>();
             yield return new PropertyInfo<HydraulicBoundaryDatabaseContext, HydraulicBoundaryDatabaseProperties>();
-            yield return new PropertyInfo<SimpleFailureMechanismContext, StandAloneFailureMechanismContextProperties>();
+            yield return new PropertyInfo<FailureMechanismContext<IFailureMechanism>, StandAloneFailureMechanismContextProperties>();
         }
 
         /// <summary>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAloneFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -r20bb156dfc129b1602ddbcddc73c0806807f19ab -rdaa1008263412accdb1fcad949ddf100fb2e97b7
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAloneFailureMechanismContextPropertiesTest.cs	(.../StandAloneFailureMechanismContextPropertiesTest.cs)	(revision 20bb156dfc129b1602ddbcddc73c0806807f19ab)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAloneFailureMechanismContextPropertiesTest.cs	(.../StandAloneFailureMechanismContextPropertiesTest.cs)	(revision daa1008263412accdb1fcad949ddf100fb2e97b7)
@@ -23,7 +23,9 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Integration.Data.StandAlone;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
 
@@ -41,14 +43,14 @@
             var properties = new StandAloneFailureMechanismContextProperties();
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<SimpleFailureMechanismContext>>(properties);
+            Assert.IsInstanceOf<ObjectProperties<FailureMechanismContext<IFailureMechanism>>>(properties);
         }
 
         [Test]
-        public void Data_SetNewStandAloneFailureMechanismContextInstance_ReturnCorrectPropertyValues()
+        public void Data_SetNewSimpleFailureMechanismContextInstance_ReturnCorrectPropertyValues()
         {
             // Setup
-            var failureMechanism = new MacrostabilityInwardsFailureMechanism();
+            var failureMechanism = new TestFailureMechanism();
             var properties = new StandAloneFailureMechanismContextProperties();
 
             // Call
@@ -58,5 +60,20 @@
             Assert.AreEqual(failureMechanism.Name, properties.Name);
             Assert.AreEqual(failureMechanism.Code, properties.Code);
         } 
+
+        [Test]
+        public void Data_SetNewCustomFailureMechanismContextInstance_ReturnCorrectPropertyValues()
+        {
+            // Setup
+            var failureMechanism = new TestFailureMechanism();
+            var properties = new StandAloneFailureMechanismContextProperties();
+
+            // Call
+            properties.Data = new CustomFailureMechanismContext(failureMechanism, new MockRepository().StrictMock<IAssessmentSection>());
+
+            // Assert
+            Assert.AreEqual(failureMechanism.Name, properties.Name);
+            Assert.AreEqual(failureMechanism.Code, properties.Code);
+        } 
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs
===================================================================
diff -u -r41fac7fff0a505c08945108d795dcb877f10b816 -rdaa1008263412accdb1fcad949ddf100fb2e97b7
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision 41fac7fff0a505c08945108d795dcb877f10b816)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision daa1008263412accdb1fcad949ddf100fb2e97b7)
@@ -194,7 +194,7 @@
                 Assert.IsNull(hydraulicBoundaryDatabaseProperties.GetObjectPropertiesData);
                 Assert.IsNull(hydraulicBoundaryDatabaseProperties.AfterCreate);
 
-                var standAloneFailureMechanismProperties = propertyInfos.Single(pi => pi.DataType == typeof(SimpleFailureMechanismContext));
+                var standAloneFailureMechanismProperties = propertyInfos.Single(pi => pi.DataType == typeof(FailureMechanismContext<IFailureMechanism>));
                 Assert.AreEqual(typeof(StandAloneFailureMechanismContextProperties), standAloneFailureMechanismProperties.PropertyObjectType);
                 Assert.IsNull(standAloneFailureMechanismProperties.AdditionalDataCheck);
                 Assert.IsNull(standAloneFailureMechanismProperties.GetObjectPropertiesData);