Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r5f8541d2a46730d67fc2d859caa6de2921bbc820 -rc016f7af2a4afdc96fc19b8db86dc8d3559de023
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 5f8541d2a46730d67fc2d859caa6de2921bbc820)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision c016f7af2a4afdc96fc19b8db86dc8d3559de023)
@@ -37,6 +37,7 @@
 using Ringtoets.ClosingStructures.Service;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms;
@@ -62,7 +63,7 @@
             {
                 CreateInstance = context => new ClosingStructuresFailureMechanismProperties(
                     context.WrappedData,
-                    new FailureMechanismPropertyChangeHandler())
+                    new FailureMechanismPropertyChangeHandler<IFailureMechanism>())
             };
             yield return new PropertyInfo<ClosingStructure, ClosingStructureProperties>();
             yield return new PropertyInfo<ClosingStructuresInputContext, ClosingStructuresInputContextProperties>();
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/FailureMechanismPropertyChangeHandler.cs
===================================================================
diff -u -r4d77063761342b4686ef4a56c47874558a53dec7 -rc016f7af2a4afdc96fc19b8db86dc8d3559de023
--- Ringtoets/Common/src/Ringtoets.Common.Forms/FailureMechanismPropertyChangeHandler.cs	(.../FailureMechanismPropertyChangeHandler.cs)	(revision 4d77063761342b4686ef4a56c47874558a53dec7)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/FailureMechanismPropertyChangeHandler.cs	(.../FailureMechanismPropertyChangeHandler.cs)	(revision c016f7af2a4afdc96fc19b8db86dc8d3559de023)
@@ -14,7 +14,7 @@
     /// Class which properly handles data model changes due to a change of a
     /// failure mechanism property.
     /// </summary>
-    public class FailureMechanismPropertyChangeHandler : IFailureMechanismPropertyChangeHandler<IFailureMechanism>
+    public class FailureMechanismPropertyChangeHandler<T> : IFailureMechanismPropertyChangeHandler<T> where T : IFailureMechanism
     {
         public bool ConfirmPropertyChange()
         {
@@ -24,7 +24,7 @@
             return result == DialogResult.OK;
         }
 
-        public virtual IEnumerable<IObservable> PropertyChanged(IFailureMechanism failureMechanism)
+        public virtual IEnumerable<IObservable> PropertyChanged(T failureMechanism)
         {
             if (failureMechanism == null)
             {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/FailureMechanismPropertyChangeHandlerTest.cs
===================================================================
diff -u -r545b105a213ed85564861b4bcf6d2d6425dbde50 -rc016f7af2a4afdc96fc19b8db86dc8d3559de023
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/FailureMechanismPropertyChangeHandlerTest.cs	(.../FailureMechanismPropertyChangeHandlerTest.cs)	(revision 545b105a213ed85564861b4bcf6d2d6425dbde50)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/FailureMechanismPropertyChangeHandlerTest.cs	(.../FailureMechanismPropertyChangeHandlerTest.cs)	(revision c016f7af2a4afdc96fc19b8db86dc8d3559de023)
@@ -29,7 +29,7 @@
                 tester.ClickOk();
             };
 
-            var handler = new FailureMechanismPropertyChangeHandler();
+            var handler = new FailureMechanismPropertyChangeHandler<IFailureMechanism>();
 
             // Call
             handler.ConfirmPropertyChange();
@@ -51,7 +51,7 @@
                 tester.ClickOk();
             };
 
-            var handler = new FailureMechanismPropertyChangeHandler();
+            var handler = new FailureMechanismPropertyChangeHandler<IFailureMechanism>();
 
             // Call
             bool result = handler.ConfirmPropertyChange();
@@ -69,7 +69,7 @@
                 tester.ClickCancel();
             };
 
-            var handler = new FailureMechanismPropertyChangeHandler();
+            var handler = new FailureMechanismPropertyChangeHandler<IFailureMechanism>();
 
             // Call
             bool result = handler.ConfirmPropertyChange();
@@ -82,7 +82,7 @@
         public void ChangeComposition_WithoutFailureMechanism_ThrowsArgumentNullException()
         {
             // Setup
-            var handler = new FailureMechanismPropertyChangeHandler();
+            var handler = new FailureMechanismPropertyChangeHandler<IFailureMechanism>();
 
             // Call
             TestDelegate test = () => handler.PropertyChanged(null);
@@ -97,7 +97,7 @@
         public void ChangeComposition_FailureMechanismWithDifferentCalculationCollections_ReturnsCalculationsWhichHadOutput(ChangePropertyTestCase testCase)
         {
             // Setup
-            var handler = new FailureMechanismPropertyChangeHandler();
+            var handler = new FailureMechanismPropertyChangeHandler<IFailureMechanism>();
             IFailureMechanism failureMechanism = new TestFailureMechanism(testCase.Calculations);
 
             // Call
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -rbdfdac3498b97ecf6bf04d53c581f557e7e87795 -rc016f7af2a4afdc96fc19b8db86dc8d3559de023
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision bdfdac3498b97ecf6bf04d53c581f557e7e87795)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision c016f7af2a4afdc96fc19b8db86dc8d3559de023)
@@ -31,6 +31,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Forms;
 using Ringtoets.Common.Forms.Helpers;
@@ -59,7 +60,7 @@
         {
             yield return new PropertyInfo<GrassCoverErosionInwardsFailureMechanismContext, GrassCoverErosionInwardsFailureMechanismContextProperties>
             {
-                CreateInstance = context => new GrassCoverErosionInwardsFailureMechanismContextProperties(context, new FailureMechanismPropertyChangeHandler())
+                CreateInstance = context => new GrassCoverErosionInwardsFailureMechanismContextProperties(context, new FailureMechanismPropertyChangeHandler<IFailureMechanism>())
             };
             yield return new PropertyInfo<DikeProfile, DikeProfileProperties>();
             yield return new PropertyInfo<GrassCoverErosionInwardsInputContext, GrassCoverErosionInwardsInputContextProperties>();
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs
===================================================================
diff -u -r4d77063761342b4686ef4a56c47874558a53dec7 -rc016f7af2a4afdc96fc19b8db86dc8d3559de023
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs	(.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs)	(revision 4d77063761342b4686ef4a56c47874558a53dec7)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs	(.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs)	(revision c016f7af2a4afdc96fc19b8db86dc8d3559de023)
@@ -14,7 +14,7 @@
     /// Class which properly handles data model changes due to a change of a
     /// grass cover erosion outwards failure mechanism property.
     /// </summary>
-    public class GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler : FailureMechanismPropertyChangeHandler, IFailureMechanismPropertyChangeHandler<GrassCoverErosionOutwardsFailureMechanism>
+    public class GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler : FailureMechanismPropertyChangeHandler<GrassCoverErosionOutwardsFailureMechanism>
     {
         protected override string ConfirmationMessage
         {
@@ -24,7 +24,7 @@
             }
         }
 
-        public IEnumerable<IObservable> PropertyChanged(GrassCoverErosionOutwardsFailureMechanism failureMechanism)
+        public override IEnumerable<IObservable> PropertyChanged(GrassCoverErosionOutwardsFailureMechanism failureMechanism)
         {
             if (failureMechanism == null)
             {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -rbdfdac3498b97ecf6bf04d53c581f557e7e87795 -rc016f7af2a4afdc96fc19b8db86dc8d3559de023
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision bdfdac3498b97ecf6bf04d53c581f557e7e87795)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision c016f7af2a4afdc96fc19b8db86dc8d3559de023)
@@ -32,6 +32,7 @@
 using Core.Common.Gui.Plugin;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
@@ -68,7 +69,7 @@
         {
             yield return new PropertyInfo<PipingFailureMechanismContext, PipingFailureMechanismContextProperties>
             {
-                CreateInstance = context => new PipingFailureMechanismContextProperties(context, new FailureMechanismPropertyChangeHandler())
+                CreateInstance = context => new PipingFailureMechanismContextProperties(context, new FailureMechanismPropertyChangeHandler<IFailureMechanism>())
             };
             yield return new PropertyInfo<PipingInputContext, PipingInputContextProperties>();
             yield return new PropertyInfo<PipingOutputContext, PipingOutputContextProperties>();