Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs
===================================================================
diff -u -rca23b1b155ca87c0aa4665fd919727570f31c781 -rcad219225ee11e816a86a0763d7b888a4d49d8a0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs	(.../HeightStructuresInputContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs	(.../HeightStructuresInputContext.cs)	(revision cad219225ee11e816a86a0763d7b888a4d49d8a0)
@@ -30,7 +30,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="HeightStructuresInput"/>
     /// in order to be able to configure height structures calculations.
     /// </summary>
-    public class HeightStructuresInputContext : FailureMechanismItemContextBase<HeightStructuresInput, HeightStructuresFailureMechanism>
+    public class HeightStructuresInputContext : InputContextBase<HeightStructuresInput, HeightStructuresCalculation, HeightStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="HeightStructuresInputContext"/>.
@@ -42,11 +42,8 @@
         public HeightStructuresInputContext(HeightStructuresCalculation calculation,
                                             HeightStructuresFailureMechanism failureMechanism,
                                             IAssessmentSection assessmentSection)
-            : base(ValidateCalculation(calculation).InputParameters, failureMechanism, assessmentSection) {
+            : base(ValidateCalculation(calculation).InputParameters, calculation, failureMechanism, assessmentSection) {}
 
-            Calculation = calculation;
-        }
-
         private static HeightStructuresCalculation ValidateCalculation(HeightStructuresCalculation calculation)
         {
             if (calculation == null)
@@ -55,10 +52,5 @@
             }
             return calculation;
         }
-
-        /// <summary>
-        /// Gets the calculation item which the context belongs to.
-        /// </summary>
-        public HeightStructuresCalculation Calculation { get; private set; }
     }
 }
\ No newline at end of file