Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r179bd759cd5b44e2b1665f808a26663abacf91a3 -r72c5c7e47ffc39365cee26e3ce49b2a80e08f70f
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 179bd759cd5b44e2b1665f808a26663abacf91a3)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 72c5c7e47ffc39365cee26e3ce49b2a80e08f70f)
@@ -40,7 +40,6 @@
 using Riskeer.Common.Forms.ExportInfos;
 using Riskeer.Common.Forms.ImportInfos;
 using Riskeer.Common.Forms.PresentationObjects;
-using Riskeer.Common.Forms.PropertyClasses;
 using Riskeer.Common.Forms.TreeNodeInfos;
 using Riskeer.Common.IO.FileImporters.MessageProviders;
 using Riskeer.Common.IO.SoilProfile;
@@ -129,9 +128,14 @@
             {
                 CreateInstance = stochasticSoilProfile => new PipingStochasticSoilProfileProperties(stochasticSoilProfile)
             };
-            yield return new PropertyInfo<PipingFailureMechanismSectionsContext, FailureMechanismSectionsProperties>
+            yield return new PropertyInfo<PipingFailureMechanismSectionsContext, PipingFailureMechanismSectionConfigurationsProperties>
             {
-                CreateInstance = context => new FailureMechanismSectionsProperties(context.WrappedData)
+                CreateInstance = context =>
+                {
+                    var failureMechanism = (PipingFailureMechanism) context.WrappedData;
+                    return new PipingFailureMechanismSectionConfigurationsProperties(failureMechanism, 
+                                                                                     configuration => new PipingFailureMechanismSectionConfigurationChangeHandler(configuration, failureMechanism));
+                }
             };
             yield return new PropertyInfo<ProbabilisticPipingProfileSpecificOutputContext, ProbabilisticPipingOutputProperties>
             {
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs
===================================================================
diff -u -r4fdc8a36cd926dece4a568ab0d00e53afd02be17 -r72c5c7e47ffc39365cee26e3ce49b2a80e08f70f
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision 4fdc8a36cd926dece4a568ab0d00e53afd02be17)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision 72c5c7e47ffc39365cee26e3ce49b2a80e08f70f)
@@ -135,7 +135,7 @@
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(PipingFailureMechanismSectionsContext),
-                    typeof(FailureMechanismSectionsProperties));
+                    typeof(PipingFailureMechanismSectionConfigurationsProperties));
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/PipingFailureMechanismSectionsContextPropertyInfoTest.cs
===================================================================
diff -u -r090619f91c775033a6a630f77958e9c8b5c835c1 -r72c5c7e47ffc39365cee26e3ce49b2a80e08f70f
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/PipingFailureMechanismSectionsContextPropertyInfoTest.cs	(.../PipingFailureMechanismSectionsContextPropertyInfoTest.cs)	(revision 090619f91c775033a6a630f77958e9c8b5c835c1)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/PipingFailureMechanismSectionsContextPropertyInfoTest.cs	(.../PipingFailureMechanismSectionsContextPropertyInfoTest.cs)	(revision 72c5c7e47ffc39365cee26e3ce49b2a80e08f70f)
@@ -25,9 +25,9 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Forms.PropertyClasses;
 using Riskeer.Piping.Data;
 using Riskeer.Piping.Forms.PresentationObjects;
+using Riskeer.Piping.Forms.PropertyClasses;
 
 namespace Riskeer.Piping.Plugin.Test.PropertyInfos
 {
@@ -41,7 +41,7 @@
         public void SetUp()
         {
             plugin = new PipingPlugin();
-            info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(FailureMechanismSectionsProperties));
+            info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(PipingFailureMechanismSectionConfigurationsProperties));
         }
 
         [TearDown]
@@ -55,7 +55,7 @@
         {
             // Assert
             Assert.AreEqual(typeof(PipingFailureMechanismSectionsContext), info.DataType);
-            Assert.AreEqual(typeof(FailureMechanismSectionsProperties), info.PropertyObjectType);
+            Assert.AreEqual(typeof(PipingFailureMechanismSectionConfigurationsProperties), info.PropertyObjectType);
         }
 
         [Test]
@@ -72,7 +72,7 @@
             IObjectProperties objectProperties = info.CreateInstance(failureMechanismSectionsContext);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismSectionsProperties>(objectProperties);
+            Assert.IsInstanceOf<PipingFailureMechanismSectionConfigurationsProperties>(objectProperties);
             Assert.AreSame(failureMechanismSectionsContext.WrappedData, objectProperties.Data);
             mocks.VerifyAll();
         }