Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113 -r1c01ea681887e96b5b80fb7d23680a4eeac9bd50
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 1c01ea681887e96b5b80fb7d23680a4eeac9bd50)
@@ -57,6 +57,10 @@
 
         public override IEnumerable<PropertyInfo> GetPropertyInfos()
         {
+            yield return new PropertyInfo<PipingFailureMechanismContext, GeneralPipingInputProperties>
+            {
+                GetObjectPropertiesData = mechanism => mechanism.WrappedData.GeneralInput
+            };
             yield return new PropertyInfo<PipingCalculationContext, PipingCalculationContextProperties>();
             yield return new PropertyInfo<PipingCalculationGroupContext, PipingCalculationGroupContextProperties>();
             yield return new PropertyInfo<PipingInputContext, PipingInputContextProperties>();
@@ -346,7 +350,7 @@
 
         private void AddCalculation(PipingFailureMechanism failureMechanism)
         {
-            var calculation = new PipingCalculation
+            var calculation = new PipingCalculation(failureMechanism.GeneralInput)
             {
                 Name = NamingHelper.GetUniqueName(failureMechanism.CalculationsGroup.Children, PipingDataResources.PipingCalculation_DefaultName, c => c.Name)
             };
@@ -555,7 +559,7 @@
                 PipingFormsResources.PipingCalculationGroup_Add_PipingCalculation_ToolTip,
                 PipingFormsResources.PipingIcon, (o, args) =>
                 {
-                    var calculation = new PipingCalculation
+                    var calculation = new PipingCalculation(nodeData.PipingFailureMechanism.GeneralInput)
                     {
                         Name = NamingHelper.GetUniqueName(group.Children, PipingDataResources.PipingCalculation_DefaultName, c => c.Name)
                     };