Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -rb1a215180352084c8f320439c1893c639917f338 -rdac3c545bf5c45f302b8a6c6bd7730bf4e57ab4f
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision b1a215180352084c8f320439c1893c639917f338)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision dac3c545bf5c45f302b8a6c6bd7730bf4e57ab4f)
@@ -122,22 +122,7 @@
                 CanDrag = (pipingCalculationContext, parentData) => true
             };
 
-            yield return new TreeNodeInfo<PipingCalculationGroupContext>
-            {
-                Text = pipingCalculationGroupContext => pipingCalculationGroupContext.WrappedData.Name,
-                Image = pipingCalculationGroupContext => RingtoetsCommonFormsResources.GeneralFolderIcon,
-                EnsureVisibleOnCreate = pipingCalculationGroupContext => true,
-                ChildNodeObjects = PipingCalculationGroupContextChildNodeObjects,
-                ContextMenuStrip = PipingCalculationGroupContextContextMenuStrip,
-                CanRename = PipingCalculationGroupContextCanRenameNode,
-                OnNodeRenamed = PipingCalculationGroupContextOnNodeRenamed,
-                CanRemove = PipingCalculationGroupContextCanRemove,
-                OnNodeRemoved = PipingCalculationGroupContextOnNodeRemoved,
-                CanDrag = PipingCalculationGroupContextCanDrag,
-                CanDrop = PipingCalculationGroupContextCanDropOrCanInsert,
-                CanInsert = PipingCalculationGroupContextCanDropOrCanInsert,
-                OnDrop = PipingCalculationGroupContextOnDrop
-            };
+            yield return CreatePipingCalculationGroupContextTreeNodeInfo();
 
             yield return new TreeNodeInfo<PipingInputContext>
             {
@@ -248,6 +233,24 @@
             };
         }
 
+        private TreeNodeInfo<PipingCalculationGroupContext> CreatePipingCalculationGroupContextTreeNodeInfo()
+        {
+            var treeNodeInfo = TreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo<PipingCalculationGroupContext>(null, null, Gui);
+
+            treeNodeInfo.ChildNodeObjects = PipingCalculationGroupContextChildNodeObjects;
+            treeNodeInfo.ContextMenuStrip = PipingCalculationGroupContextContextMenuStrip;
+            treeNodeInfo.CanRename = PipingCalculationGroupContextCanRenameNode;
+            treeNodeInfo.OnNodeRenamed = PipingCalculationGroupContextOnNodeRenamed;
+            treeNodeInfo.CanRemove = PipingCalculationGroupContextCanRemove;
+            treeNodeInfo.OnNodeRemoved = PipingCalculationGroupContextOnNodeRemoved;
+            treeNodeInfo.CanDrag = PipingCalculationGroupContextCanDrag;
+            treeNodeInfo.CanDrop = PipingCalculationGroupContextCanDropOrCanInsert;
+            treeNodeInfo.CanInsert = PipingCalculationGroupContextCanDropOrCanInsert;
+            treeNodeInfo.OnDrop = PipingCalculationGroupContextOnDrop;
+
+            return treeNodeInfo;
+        }
+
         # region PipingCalculationsView ViewInfo
 
         private bool ClosePipingFailureMechanismViewForData(PipingFailureMechanismView view, object o)