diff --git a/src/machines/MyControledMachine/jobcontrol.ts b/src/machines/MyControledMachine/jobcontrol.ts
index b9f170d5..9e4739d7 100644
--- a/src/machines/MyControledMachine/jobcontrol.ts
+++ b/src/machines/MyControledMachine/jobcontrol.ts
@@ -66,6 +66,15 @@ export const createJobContolLogic = async (
     organizedBy: machinesFolder,
   });
 
+  const machineryBuildingBlocks = namespace.addObject({
+    browseName: {
+      name: "MachineryBuildingBlocks",
+      namespaceIndex: machineryIdx,
+    },
+    typeDefinition: "FolderType",
+    componentOf: controledMachine,
+  });
+
   const machineryIdentificationType = addressSpace?.findNode(
     `ns=${machineryIdx};i=1012`,
   ) as UAObjectType;
@@ -131,6 +140,12 @@ export const createJobContolLogic = async (
     ],
   } as InstantiateObjectOptions);
 
+  jobManager.addReference({
+    referenceType: "HasAddIn",
+    nodeId: machineryBuildingBlocks,
+    isForward: false,
+  });
+
   const ISA95Idx = addressSpace.getNamespaceIndex(
     "http://opcfoundation.org/UA/ISA95-JOBCONTROL_V2/",
   );