Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationsView.cs
===================================================================
diff -u -r0d7adf0a775726924452730574a3b7e52ce00216 -r0c97a6680d07f6b63a8ddd75a5baec7d7e4d1cfd
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationsView.cs	(.../HeightStructuresCalculationsView.cs)	(revision 0d7adf0a775726924452730574a3b7e52ce00216)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationsView.cs	(.../HeightStructuresCalculationsView.cs)	(revision 0c97a6680d07f6b63a8ddd75a5baec7d7e4d1cfd)
@@ -459,28 +459,12 @@
             using (var dialog = new StructureSelectionDialog(Parent, failureMechanism.HeightStructures))
             {
                 dialog.ShowDialog();
-                GenerateCalculations(calculationGroup, dialog.SelectedItems.Cast<HeightStructure>());
+                StructureCalculationConfigurationHelper.GenerateCalculations<HeightStructure, HeightStructuresInput>(calculationGroup, dialog.SelectedItems.Cast<HeightStructure>());
             }
 
             calculationGroup.NotifyObservers();
         }
 
-        private static void GenerateCalculations(CalculationGroup calculationGroup, IEnumerable<HeightStructure> structures)
-        {
-            foreach (HeightStructure structure in structures)
-            {
-                var calculation = new StructuresCalculationScenario<HeightStructuresInput>
-                {
-                    Name = NamingHelper.GetUniqueName(calculationGroup.Children, structure.Name, c => c.Name),
-                    InputParameters =
-                    {
-                        Structure = structure
-                    }
-                };
-                calculationGroup.Children.Add(calculation);
-            }
-        }
-
         private void OnFailureMechanismUpdate()
         {
             UpdateSectionsListBox();
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -rfc83836f020db506a2678db4a81da3931e09dd6c -r0c97a6680d07f6b63a8ddd75a5baec7d7e4d1cfd
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision fc83836f020db506a2678db4a81da3931e09dd6c)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 0c97a6680d07f6b63a8ddd75a5baec7d7e4d1cfd)
@@ -652,29 +652,12 @@
 
                 if (dialog.SelectedItems.Any())
                 {
-                    GenerateHeightStructuresCalculations(dialog.SelectedItems.Cast<HeightStructure>(),
-                                                         nodeData.WrappedData.Children);
+                    StructureCalculationConfigurationHelper.GenerateCalculations<HeightStructure, HeightStructuresInput>(nodeData.WrappedData, dialog.SelectedItems.Cast<HeightStructure>());
                     nodeData.NotifyObservers();
                 }
             }
         }
 
-        private static void GenerateHeightStructuresCalculations(IEnumerable<HeightStructure> structures, List<ICalculationBase> calculations)
-        {
-            foreach (HeightStructure structure in structures)
-            {
-                var calculation = new StructuresCalculationScenario<HeightStructuresInput>
-                {
-                    Name = NamingHelper.GetUniqueName(calculations, structure.Name, c => c.Name),
-                    InputParameters =
-                    {
-                        Structure = structure
-                    }
-                };
-                calculations.Add(calculation);
-            }
-        }
-
         private static void AddCalculation(HeightStructuresCalculationGroupContext context)
         {
             var calculation = new StructuresCalculationScenario<HeightStructuresInput>