diff --git a/app/src/modules/simulation/machine/machine.tsx b/app/src/modules/simulation/machine/machine.tsx
index 32c3b8e..96a5b39 100644
--- a/app/src/modules/simulation/machine/machine.tsx
+++ b/app/src/modules/simulation/machine/machine.tsx
@@ -2,6 +2,29 @@ import React from 'react'
 import MachineInstances from './instances/machineInstances'
 
 function Machine() {
+
+    const machineSample: MachineEventSchema = {
+        modelUuid: "machine-1234-5678-9012",
+        modelName: "CNC Milling Machine",
+        position: [10, 0, 5],
+        rotation: [0, 0, 0],
+        state: "idle",
+        type: "machine",
+        point: {
+            uuid: "machine-point-9876-5432-1098",
+            position: [10, 0.5, 5.2],
+            rotation: [0, 0, 0],
+            action: {
+                actionUuid: "machine-action-2468-1357-8024",
+                actionName: "Metal Processing",
+                actionType: "process",
+                processTime: 10,
+                swapMaterial: "steel",
+                triggers: []
+            }
+        }
+    };
+
     return (
         <>
 
diff --git a/app/src/modules/simulation/triggers/connector/triggerConnector.tsx b/app/src/modules/simulation/triggers/connector/triggerConnector.tsx
index b554979..5c4c602 100644
--- a/app/src/modules/simulation/triggers/connector/triggerConnector.tsx
+++ b/app/src/modules/simulation/triggers/connector/triggerConnector.tsx
@@ -59,9 +59,10 @@ function TriggerConnector() {
         if (!product || products.length === 0) return;
 
         product.eventDatas.forEach(event => {
-            if ('points' in event) {
+            // Handle Conveyor points
+            if (event.type === "transfer" && 'points' in event) {
                 event.points.forEach(point => {
-                    if ('action' in point && point.action?.triggers) {
+                    if (point.action?.triggers) {
                         point.action.triggers.forEach(trigger => {
                             if (trigger.triggeredAsset) {
                                 newConnections.push({
@@ -74,14 +75,53 @@ function TriggerConnector() {
                         });
                     }
                 });
-            } else if ('point' in event) {
-                if ('actions' in event.point) {
-                    console.log(event);
-
-                    // you left here
-
-                } else if ('action' in event.point) {
-                    console.log(event);
+            }
+            // Handle Vehicle point
+            else if (event.type === "vehicle" && 'point' in event) {
+                const point = event.point;
+                if (point.action?.triggers) {
+                    point.action.triggers.forEach(trigger => {
+                        if (trigger.triggeredAsset) {
+                            newConnections.push({
+                                id: `${point.uuid}-${trigger.triggeredAsset.triggeredPoint.pointUuid}-${trigger.triggerUuid}`,
+                                startPointUuid: point.uuid,
+                                endPointUuid: trigger.triggeredAsset.triggeredPoint.pointUuid,
+                                trigger
+                            });
+                        }
+                    });
+                }
+            }
+            // Handle Robotic Arm points
+            else if (event.type === "roboticArm" && 'point' in event) {
+                const point = event.point;
+                point.actions?.forEach(action => {
+                    action.triggers?.forEach(trigger => {
+                        if (trigger.triggeredAsset) {
+                            newConnections.push({
+                                id: `${point.uuid}-${trigger.triggeredAsset.triggeredPoint.pointUuid}-${trigger.triggerUuid}`,
+                                startPointUuid: point.uuid,
+                                endPointUuid: trigger.triggeredAsset.triggeredPoint.pointUuid,
+                                trigger
+                            });
+                        }
+                    });
+                });
+            }
+            // Handle Machine point
+            else if (event.type === "machine" && 'point' in event) {
+                const point = event.point;
+                if (point.action?.triggers) {
+                    point.action.triggers.forEach(trigger => {
+                        if (trigger.triggeredAsset) {
+                            newConnections.push({
+                                id: `${point.uuid}-${trigger.triggeredAsset.triggeredPoint.pointUuid}-${trigger.triggerUuid}`,
+                                startPointUuid: point.uuid,
+                                endPointUuid: trigger.triggeredAsset.triggeredPoint.pointUuid,
+                                trigger
+                            });
+                        }
+                    });
                 }
             }
         });
diff --git a/app/src/modules/simulation/vehicle/vehicles.tsx b/app/src/modules/simulation/vehicle/vehicles.tsx
index 7badec5..61dc1a0 100644
--- a/app/src/modules/simulation/vehicle/vehicles.tsx
+++ b/app/src/modules/simulation/vehicle/vehicles.tsx
@@ -13,9 +13,7 @@ function Vehicles() {
     const { floorItems } = useFloorItems();
     const { isPlaying } = usePlayButtonStore();
 
-    const [vehicleStatusSample, setVehicleStatusSample] = useState<
-        VehicleEventSchema[]
-    >([
+    const [vehicleStatusSample, setVehicleStatusSample] = useState<VehicleEventSchema[]>([
         {
             modelUuid: "9356f710-4727-4b50-bdb2-9c1e747ecc74",
             modelName: "AGV",
@@ -34,7 +32,7 @@ function Vehicles() {
                     actionType: "travel",
                     unLoadDuration: 10,
                     loadCapacity: 2,
-                    steeringAngle:0,
+                    steeringAngle: 0,
                     pickUpPoint: { position: { x: 98.71483985219794, y: 0, z: 28.66321267938962 }, rotation: { x: 0, y: 0, z: 0 } },
                     unLoadPoint: { position: { x: 105.71483985219794, y: 0, z: 28.66321267938962 }, rotation: { x: 0, y: 0, z: 0 } },
                     triggers: [
@@ -78,7 +76,7 @@ function Vehicles() {
                     actionType: "travel",
                     unLoadDuration: 10,
                     loadCapacity: 2,
-                    steeringAngle:0,
+                    steeringAngle: 0,
                     pickUpPoint: null,
                     unLoadPoint: null,
                     triggers: [