From 6780e73dd189d988c3276f200abffb90e539d090 Mon Sep 17 00:00:00 2001
From: Jerald-Golden-B <jerald@hexrfactory.com>
Date: Thu, 5 Jun 2025 15:37:49 +0530
Subject: [PATCH] Refactor product identifier from 'productId' to 'productUuid'
 across simulation stores and related types for consistency and clarity

---
 .../layout/scenes/ComparisonScene.tsx         |   2 +-
 .../components/layout/scenes/MainScene.tsx    |   2 +-
 .../properties/GlobalProperties.tsx           |   8 +-
 .../eventProperties/EventProperties.tsx       |   7 +-
 .../components/ActionsList.tsx                |  15 +-
 .../mechanics/conveyorMechanics.tsx           |  59 +-
 .../mechanics/machineMechanics.tsx            |  38 +-
 .../mechanics/roboticArmMechanics.tsx         | 512 +++++-----
 .../mechanics/storageMechanics.tsx            |  40 +-
 .../mechanics/vehicleMechanics.tsx            |  52 +-
 .../eventProperties/trigger/Trigger.tsx       | 872 ++++++++----------
 .../sidebarRight/simulation/Simulations.tsx   | 480 +++++-----
 .../IotInputCards/BarChartInput.tsx           |   8 +-
 .../IotInputCards/LineGrapInput.tsx           |   8 +-
 .../IotInputCards/PieChartInput.tsx           |   8 +-
 .../IotInputCards/Progress1Input.tsx          |   8 +-
 .../IotInputCards/Progress2Input.tsx          |   8 +-
 .../templates/CollaborationPopup.tsx          |   2 +-
 .../ui/compareVersion/CompareLayOut.tsx       |   4 +-
 .../builder/asset/functions/addAssetModel.ts  | 853 ++++++++---------
 .../builder/asset/models/model/model.tsx      |   2 +-
 .../selectionControls/moveControls.tsx        |  22 +-
 .../selectionControls/rotateControls.tsx      |  16 +-
 .../selectionControls/selectionControls.tsx   |   3 +-
 .../transformControls/transformControls.tsx   |  17 +-
 .../conveyor/actionHandler/useSpawnHandler.ts |  10 +-
 .../actionHandler/useProcessHandler.ts        |   2 +-
 .../actionHandler/usePickAndPlaceHandler.ts   |   4 +-
 .../actionHandler/useRetrieveHandler.ts       |  14 +-
 .../actionHandler/useStoreHandler.ts          |   2 +-
 .../vehicle/actionHandler/useTravelHandler.ts |   4 +-
 .../analysis/throughPut/throughPutData.tsx    |   2 +-
 .../conveyorInstance/conveyorInstance.tsx     |   4 +-
 .../events/points/creator/pointsCreator.tsx   |  28 +-
 .../functions/handleAddEventToProduct.ts      |  19 +-
 .../triggerConnections/triggerConnector.tsx   |  58 +-
 .../machineInstance/machineInstance.tsx       |   2 +-
 .../instances/instance/materialInstance.tsx   |  12 +-
 .../modules/simulation/products/products.tsx  |  49 +-
 .../armInstance/roboticArmInstance.tsx        |   8 +-
 .../checkActiveRoboticArmsInSubsequence.ts    |   6 +-
 .../getConveyorSequencesInProduct.ts          |   4 +-
 .../simulation/simulator/simulator.tsx        |   4 +-
 .../simulation/spatialUI/arm/armBotUI.tsx     |  27 +-
 .../spatialUI/arm/useDraggableGLTF.ts         |   2 +-
 .../spatialUI/vehicle/vehicleUI.tsx           | 724 +++++++--------
 .../triggerHandler/useTriggerHandler.ts       |  42 +-
 .../instances/instance/vehicleInstance.tsx    |  10 +-
 .../widgets/2d/charts/BarGraphComponent.tsx   |   4 +-
 .../2d/charts/DoughnutGraphComponent.tsx      |   4 +-
 .../widgets/2d/charts/LineGraphComponent.tsx  |   4 +-
 .../widgets/2d/charts/PieGraphComponent.tsx   |   4 +-
 .../2d/charts/PolarAreaGraphComponent.tsx     |   4 +-
 .../widgets/2d/charts/ProgressCard1.tsx       |   4 +-
 .../widgets/2d/charts/ProgressCard2.tsx       |   4 +-
 app/src/pages/Project.tsx                     |   4 +-
 app/src/services/dashboard/createProject.ts   |   4 +-
 app/src/services/dashboard/getAllProjects.ts  |   4 +-
 app/src/services/dashboard/getTrash.ts        |   4 +-
 app/src/services/dashboard/updateProject.ts   |   4 +-
 .../assest/floorAsset/getFloorItemsApi.ts     |   4 +-
 .../assest/floorAsset/setFloorItemApi.ts      |   4 +-
 .../assest/wallAsset/getWallItemsApi.ts       |   4 +-
 .../factoryBuilder/camera/getCameraApi.ts     |   4 +-
 .../environment/findEnvironment.ts            |   4 +-
 .../environment/setEnvironment.ts             |   4 +-
 .../factoryBuilder/lines/getLinesApi.ts       |   4 +-
 .../factoryBuilder/zones/getZonesApi.ts       |   4 +-
 .../products/UpsertProductOrEventApi.ts       |   5 +-
 .../simulation/products/deleteEventDataApi.ts |   5 +-
 .../simulation/products/deleteProductApi.ts   |  11 +-
 .../simulation/products/getProductApi.ts      |   9 +-
 .../simulation/products/getallProductsApi.ts  |   7 +-
 .../simulation/products/renameProductApi.ts   |  10 +-
 .../services/visulization/zone/add3dWidget.ts |   4 +-
 .../visulization/zone/addFloatingWidgets.ts   |   4 +-
 .../services/visulization/zone/addWidgets.ts  |   4 +-
 .../services/visulization/zone/clearPanel.ts  |   4 +-
 .../visulization/zone/delete3dWidget.ts       |   4 +-
 .../visulization/zone/deleteFloatingWidget.ts |   4 +-
 .../services/visulization/zone/deletePanel.ts |   4 +-
 .../visulization/zone/deleteTemplate.ts       |   4 +-
 .../visulization/zone/deleteWidgetApi.ts      |   4 +-
 .../visulization/zone/duplicateWidget.ts      |   4 +-
 .../visulization/zone/get3dWidgetData.ts      |   4 +-
 .../visulization/zone/getFloatingData.ts      |   4 +-
 .../visulization/zone/getSelect2dZoneData.ts  |   4 +-
 .../services/visulization/zone/getTemplate.ts |   4 +-
 .../services/visulization/zone/getZoneData.ts |   4 +-
 .../services/visulization/zone/getZones.ts    |   4 +-
 .../visulization/zone/loadTemplate.ts         |   4 +-
 app/src/services/visulization/zone/panel.ts   |   4 +-
 .../visulization/zone/saveTempleteApi.ts      |   4 +-
 .../visulization/zone/update3dWidget.ts       |   8 +-
 .../visulization/zone/zoneCameraUpdation.ts   |   4 +-
 app/src/store/simulation/useArmBotStore.ts    |  14 +-
 app/src/store/simulation/useConveyorStore.ts  |  14 +-
 app/src/store/simulation/useMachineStore.ts   |  14 +-
 app/src/store/simulation/useProductStore.ts   | 188 ++--
 .../store/simulation/useSimulationStore.ts    |  28 +-
 .../store/simulation/useStorageUnitStore.ts   |  14 +-
 app/src/store/simulation/useVehicleStore.ts   |  14 +-
 app/src/types/simulationTypes.d.ts            |  12 +-
 103 files changed, 2199 insertions(+), 2397 deletions(-)

diff --git a/app/src/components/layout/scenes/ComparisonScene.tsx b/app/src/components/layout/scenes/ComparisonScene.tsx
index 237ab7f..635ebec 100644
--- a/app/src/components/layout/scenes/ComparisonScene.tsx
+++ b/app/src/components/layout/scenes/ComparisonScene.tsx
@@ -21,7 +21,7 @@ function ComparisonScene() {
     const handleSelectLayout = (option: string) => {
         const product = products.find((product) => product.productName === option);
         if (product) {
-            setComparisonProduct(product.productId, product.productName);
+            setComparisonProduct(product.productUuid, product.productName);
             setIsPlaying(true);
             setIsPaused(true);
         }
diff --git a/app/src/components/layout/scenes/MainScene.tsx b/app/src/components/layout/scenes/MainScene.tsx
index c56fa0a..b15f28f 100644
--- a/app/src/components/layout/scenes/MainScene.tsx
+++ b/app/src/components/layout/scenes/MainScene.tsx
@@ -43,7 +43,7 @@ function MainScene() {
     const handleSelectLayout = (option: string) => {
         const product = products.find((product) => product.productName === option);
         if (product) {
-            setMainProduct(product.productId, product.productName);
+            setMainProduct(product.productUuid, product.productName);
         }
     };
 
diff --git a/app/src/components/layout/sidebarRight/properties/GlobalProperties.tsx b/app/src/components/layout/sidebarRight/properties/GlobalProperties.tsx
index 3ad8acd..b07192c 100644
--- a/app/src/components/layout/sidebarRight/properties/GlobalProperties.tsx
+++ b/app/src/components/layout/sidebarRight/properties/GlobalProperties.tsx
@@ -43,7 +43,7 @@ const GlobalProperties: React.FC = () => {
         const email = localStorage.getItem("email");
         const organization = email?.split("@")[1]?.split(".")[0] || "defaultOrg";
 
-        const data = await setEnvironment(
+        setEnvironment(
             organization,
             localStorage.getItem("userId")!,
             wallVisibility,
@@ -62,7 +62,7 @@ const GlobalProperties: React.FC = () => {
         const organization = email?.split("@")[1]?.split(".")[0] || "defaultOrg";
 
         if (limitDistance) {
-            let data = await setEnvironment(
+            setEnvironment(
                 organization,
                 localStorage.getItem("userId")!,
                 wallVisibility,
@@ -74,7 +74,7 @@ const GlobalProperties: React.FC = () => {
             );
             setRenderDistance(75);
         } else {
-            let data = await setEnvironment(
+            setEnvironment(
                 organization,
                 localStorage.getItem("userId")!,
                 wallVisibility,
@@ -163,7 +163,7 @@ const GlobalProperties: React.FC = () => {
             roofVisibility,
             shadows,
             renderDistance,
-            limitDistance,projectId
+            limitDistance, projectId
         );
         //
 
diff --git a/app/src/components/layout/sidebarRight/properties/eventProperties/EventProperties.tsx b/app/src/components/layout/sidebarRight/properties/eventProperties/EventProperties.tsx
index c47a169..dd8d7ae 100644
--- a/app/src/components/layout/sidebarRight/properties/eventProperties/EventProperties.tsx
+++ b/app/src/components/layout/sidebarRight/properties/eventProperties/EventProperties.tsx
@@ -13,6 +13,7 @@ import { AddIcon } from "../../../../icons/ExportCommonIcons";
 import { handleAddEventToProduct } from "../../../../../modules/simulation/events/points/functions/handleAddEventToProduct";
 import { useEventsStore } from "../../../../../store/simulation/useEventsStore";
 import { useProductContext } from "../../../../../modules/simulation/products/productContext";
+import { useParams } from "react-router-dom";
 
 const EventProperties: React.FC = () => {
   const { selectedEventData } = useSelectedEventData();
@@ -25,6 +26,7 @@ const EventProperties: React.FC = () => {
   const [assetType, setAssetType] = useState<string | null>(null);
   const { products, addEvent } = useProductStore();
   const { selectedEventSphere } = useSelectedEventSphere();
+  const { projectId } = useParams();
 
   useEffect(() => {
     const event = getCurrentEventData();
@@ -39,7 +41,7 @@ const EventProperties: React.FC = () => {
     if (!selectedEventData?.data || !selectedProduct) return null;
     return (
       getEventByModelUuid(
-        selectedProduct.productId,
+        selectedProduct.productUuid,
         selectedEventData.data.modelUuid
       ) ?? null
     );
@@ -96,7 +98,7 @@ const EventProperties: React.FC = () => {
               {products.map((product) => (
                 <button
                   id="add-event-to-product-button"
-                  key={product.productId}
+                  key={product.productUuid}
                   onClick={() => {
                     if (selectedEventData) {
                       handleAddEventToProduct({
@@ -107,6 +109,7 @@ const EventProperties: React.FC = () => {
                           ),
                         addEvent,
                         selectedProduct,
+                        projectId: projectId || ''
                       });
                     }
                   }}
diff --git a/app/src/components/layout/sidebarRight/properties/eventProperties/components/ActionsList.tsx b/app/src/components/layout/sidebarRight/properties/eventProperties/components/ActionsList.tsx
index 52cd9db..c6f532e 100644
--- a/app/src/components/layout/sidebarRight/properties/eventProperties/components/ActionsList.tsx
+++ b/app/src/components/layout/sidebarRight/properties/eventProperties/components/ActionsList.tsx
@@ -12,6 +12,7 @@ import {
 import { useProductStore } from "../../../../../../store/simulation/useProductStore";
 import { upsertProductOrEventApi } from "../../../../../../services/simulation/products/UpsertProductOrEventApi";
 import { useProductContext } from "../../../../../../modules/simulation/products/productContext";
+import { useParams } from "react-router-dom";
 
 interface ActionsListProps {
   selectedPointData: any;
@@ -28,19 +29,17 @@ const ActionsList: React.FC<ActionsListProps> = ({
 }) => {
   const actionsContainerRef = useRef<HTMLDivElement>(null);
 
-  const email = localStorage.getItem("email");
-  const organization = email!.split("@")[1].split(".")[0];
-
   // store
   const { renameAction } = useProductStore();
   const { selectedProductStore } = useProductContext();
   const { selectedProduct } = selectedProductStore();
   const { selectedAction, setSelectedAction } = useSelectedAction();
+  const { projectId } = useParams();
 
   const handleRenameAction = (newName: string) => {
     if (!selectedAction.actionId) return;
     const event = renameAction(
-      selectedProduct.productId,
+      selectedProduct.productUuid,
       selectedAction.actionId,
       newName
     );
@@ -48,8 +47,8 @@ const ActionsList: React.FC<ActionsListProps> = ({
     if (event) {
       upsertProductOrEventApi({
         productName: selectedProduct.productName,
-        productId: selectedProduct.productId,
-        organization: organization,
+        productUuid: selectedProduct.productUuid,
+        projectId,
         eventDatas: event,
       });
     }
@@ -89,8 +88,8 @@ const ActionsList: React.FC<ActionsListProps> = ({
                 <div
                   key={action.actionUuid}
                   className={`list-item ${selectedAction.actionId === action.actionUuid
-                      ? "active"
-                      : ""
+                    ? "active"
+                    : ""
                     }`}
                 >
                   <button
diff --git a/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/conveyorMechanics.tsx b/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/conveyorMechanics.tsx
index 11be41b..6da6dbe 100644
--- a/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/conveyorMechanics.tsx
+++ b/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/conveyorMechanics.tsx
@@ -13,6 +13,7 @@ import { useProductStore } from "../../../../../../store/simulation/useProductSt
 import ActionsList from "../components/ActionsList";
 import { upsertProductOrEventApi } from "../../../../../../services/simulation/products/UpsertProductOrEventApi";
 import { useProductContext } from "../../../../../../modules/simulation/products/productContext";
+import { useParams } from "react-router-dom";
 
 function ConveyorMechanics() {
     const [activeOption, setActiveOption] = useState<"default" | "spawn" | "swap" | "delay" | "despawn">("default");
@@ -22,14 +23,12 @@ function ConveyorMechanics() {
     const { selectedProductStore } = useProductContext();
     const { selectedProduct } = selectedProductStore();
     const { setSelectedAction, clearSelectedAction } = useSelectedAction();
-
-    const email = localStorage.getItem('email')
-    const organization = (email!.split("@")[1]).split(".")[0];
+    const { projectId } = useParams();
 
     useEffect(() => {
         if (selectedEventData) {
             const point = getPointByUuid(
-                selectedProduct.productId,
+                selectedProduct.productUuid,
                 selectedEventData?.data.modelUuid,
                 selectedEventData?.selectedPoint
             ) as ConveyorPointSchema | undefined;
@@ -45,29 +44,29 @@ function ConveyorMechanics() {
 
     const updateBackend = (
         productName: string,
-        productId: string,
-        organization: string,
+        productUuid: string,
+        projectId: string,
         eventData: EventsSchema
     ) => {
         upsertProductOrEventApi({
             productName: productName,
-            productId: productId,
-            organization: organization,
+            productUuid: productUuid,
+            projectId: projectId,
             eventDatas: eventData
         })
     }
 
     const handleSpeedChange = (value: string) => {
         if (!selectedEventData) return;
-        const event = updateEvent(selectedProduct.productId, selectedEventData.data.modelUuid, {
+        const event = updateEvent(selectedProduct.productUuid, selectedEventData.data.modelUuid, {
             speed: parseFloat(value),
         });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId ||'',
                 event
             );
         }
@@ -78,15 +77,15 @@ function ConveyorMechanics() {
         const validOption = option as | "default" | "spawn" | "swap" | "delay" | "despawn";
         setActiveOption(validOption);
 
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, {
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, {
             actionType: validOption,
         });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId ||'',
                 event
             );
         }
@@ -94,13 +93,13 @@ function ConveyorMechanics() {
 
     const handleRenameAction = (newName: string) => {
         if (!selectedEventData || !selectedPointData) return;
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, { actionName: newName });
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, { actionName: newName });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId ||'',
                 event
             );
         }
@@ -108,15 +107,15 @@ function ConveyorMechanics() {
 
     const handleSpawnCountChange = (value: string) => {
         if (!selectedEventData || !selectedPointData) return;
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, {
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, {
             spawnCount: parseFloat(value),
         });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId ||'',
                 event
             );
         }
@@ -124,15 +123,15 @@ function ConveyorMechanics() {
 
     const handleSpawnIntervalChange = (value: string) => {
         if (!selectedEventData || !selectedPointData) return;
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, {
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, {
             spawnInterval: parseFloat(value),
         });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId ||'',
                 event
             );
         }
@@ -140,13 +139,13 @@ function ConveyorMechanics() {
 
     const handleMaterialSelect = (material: string) => {
         if (!selectedEventData || !selectedPointData) return;
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, { material });
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, { material });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId ||'',
                 event
             );
         }
@@ -154,15 +153,15 @@ function ConveyorMechanics() {
 
     const handleDelayChange = (value: string) => {
         if (!selectedEventData || !selectedPointData) return;
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, {
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, {
             delay: parseFloat(value),
         });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId ||'',
                 event
             );
         }
@@ -175,7 +174,7 @@ function ConveyorMechanics() {
 
     // Get current values from store
     const currentSpeed = (getEventByModelUuid(
-        selectedProduct.productId, selectedEventData?.data.modelUuid || ""
+        selectedProduct.productUuid, selectedEventData?.data.modelUuid || ""
     ) as ConveyorEventSchema | undefined)?.speed?.toString() || "0.5";
 
     const currentActionName = selectedPointData
diff --git a/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/machineMechanics.tsx b/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/machineMechanics.tsx
index 5cd2e38..a440198 100644
--- a/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/machineMechanics.tsx
+++ b/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/machineMechanics.tsx
@@ -8,6 +8,7 @@ import ProcessAction from "../actions/ProcessAction";
 import ActionsList from "../components/ActionsList";
 import { upsertProductOrEventApi } from "../../../../../../services/simulation/products/UpsertProductOrEventApi";
 import { useProductContext } from "../../../../../../modules/simulation/products/productContext";
+import { useParams } from "react-router-dom";
 
 function MachineMechanics() {
     const [activeOption, setActiveOption] = useState<"default" | "process">("default");
@@ -18,13 +19,12 @@ function MachineMechanics() {
     const { selectedProduct } = selectedProductStore();
     const { setSelectedAction, clearSelectedAction } = useSelectedAction();
 
-    const email = localStorage.getItem('email')
-    const organization = (email!.split("@")[1]).split(".")[0];
+    const { projectId } = useParams();
 
     useEffect(() => {
         if (selectedEventData) {
             const point = getPointByUuid(
-                selectedProduct.productId,
+                selectedProduct.productUuid,
                 selectedEventData?.data.modelUuid,
                 selectedEventData?.selectedPoint
             ) as MachinePointSchema | undefined;
@@ -40,14 +40,14 @@ function MachineMechanics() {
 
     const updateBackend = (
         productName: string,
-        productId: string,
-        organization: string,
+        productUuid: string,
+        projectId: string,
         eventData: EventsSchema
     ) => {
         upsertProductOrEventApi({
             productName: productName,
-            productId: productId,
-            organization: organization,
+            productUuid: productUuid,
+            projectId: projectId,
             eventDatas: eventData
         })
     }
@@ -57,15 +57,15 @@ function MachineMechanics() {
         const validOption = option as "process";
         setActiveOption(validOption);
 
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, {
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, {
             actionType: validOption,
         });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
         }
@@ -73,13 +73,13 @@ function MachineMechanics() {
 
     const handleRenameAction = (newName: string) => {
         if (!selectedPointData) return;
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, { actionName: newName });
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, { actionName: newName });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
         }
@@ -87,15 +87,15 @@ function MachineMechanics() {
 
     const handleProcessTimeChange = (value: string) => {
         if (!selectedPointData) return;
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, {
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, {
             processTime: parseFloat(value),
         });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
         }
@@ -103,15 +103,15 @@ function MachineMechanics() {
 
     const handleMaterialSelect = (material: string) => {
         if (!selectedPointData) return;
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, {
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, {
             swapMaterial: material,
         });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
         }
diff --git a/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/roboticArmMechanics.tsx b/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/roboticArmMechanics.tsx
index c1aad88..c422fb3 100644
--- a/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/roboticArmMechanics.tsx
+++ b/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/roboticArmMechanics.tsx
@@ -4,305 +4,273 @@ import InputWithDropDown from "../../../../../ui/inputs/InputWithDropDown";
 import RenameInput from "../../../../../ui/inputs/RenameInput";
 import LabledDropdown from "../../../../../ui/inputs/LabledDropdown";
 import Trigger from "../trigger/Trigger";
-import {
-  useSelectedEventData,
-  useSelectedAction,
-} from "../../../../../../store/simulation/useSimulationStore";
+import { useSelectedEventData, useSelectedAction } from "../../../../../../store/simulation/useSimulationStore";
 import { useProductStore } from "../../../../../../store/simulation/useProductStore";
 import PickAndPlaceAction from "../actions/PickAndPlaceAction";
 import ActionsList from "../components/ActionsList";
 import { upsertProductOrEventApi } from "../../../../../../services/simulation/products/UpsertProductOrEventApi";
 import { useProductContext } from "../../../../../../modules/simulation/products/productContext";
+import { useParams } from "react-router-dom";
 
 function RoboticArmMechanics() {
-  const [activeOption, setActiveOption] = useState<"default" | "pickAndPlace">(
-    "default"
-  );
-  const [selectedPointData, setSelectedPointData] = useState<
-    RoboticArmPointSchema | undefined
-  >();
-  const { selectedEventData } = useSelectedEventData();
-  const {
-    getPointByUuid,
-    getEventByModelUuid,
-    updateEvent,
-    updateAction,
-    addAction,
-    removeAction,
-  } = useProductStore();
-  const { selectedProductStore } = useProductContext();
-  const { selectedProduct } = selectedProductStore();
-  const { selectedAction, setSelectedAction, clearSelectedAction } =
-    useSelectedAction();
+    const [activeOption, setActiveOption] = useState<"default" | "pickAndPlace">("default");
+    const [selectedPointData, setSelectedPointData] = useState<RoboticArmPointSchema | undefined>();
+    const { selectedEventData } = useSelectedEventData();
+    const { getPointByUuid, getEventByModelUuid, updateEvent, updateAction, addAction, removeAction, } = useProductStore();
+    const { selectedProductStore } = useProductContext();
+    const { selectedProduct } = selectedProductStore();
+    const { selectedAction, setSelectedAction, clearSelectedAction } = useSelectedAction();
 
-  const email = localStorage.getItem("email");
-  const organization = email!.split("@")[1].split(".")[0];
+    const { projectId } = useParams();
 
-  useEffect(() => {
-    if (selectedEventData) {
-      const point = getPointByUuid(
-        selectedProduct.productId,
-        selectedEventData.data.modelUuid,
-        selectedEventData.selectedPoint
-      ) as RoboticArmPointSchema | undefined;
-      if (point?.actions) {
-        setSelectedPointData(point);
-        if (point.actions.length > 0) {
-          setActiveOption(
-            point.actions[0].actionType as "default" | "pickAndPlace"
-          );
-          setSelectedAction(
-            point.actions[0].actionUuid,
-            point.actions[0].actionName
-          );
+    useEffect(() => {
+        if (selectedEventData) {
+            const point = getPointByUuid(
+                selectedProduct.productUuid,
+                selectedEventData.data.modelUuid,
+                selectedEventData.selectedPoint
+            ) as RoboticArmPointSchema | undefined;
+            if (point?.actions) {
+                setSelectedPointData(point);
+                if (point.actions.length > 0) {
+                    setActiveOption(
+                        point.actions[0].actionType as "default" | "pickAndPlace"
+                    );
+                    setSelectedAction(
+                        point.actions[0].actionUuid,
+                        point.actions[0].actionName
+                    );
+                }
+            }
+        } else {
+            clearSelectedAction();
         }
-      }
-    } else {
-      clearSelectedAction();
-    }
-  }, [selectedEventData, selectedProduct]);
+    }, [selectedEventData, selectedProduct]);
 
-  const updateBackend = (
-    productName: string,
-    productId: string,
-    organization: string,
-    eventData: EventsSchema
-  ) => {
-    upsertProductOrEventApi({
-      productName: productName,
-      productId: productId,
-      organization: organization,
-      eventDatas: eventData,
-    });
-  };
-
-  const handleRenameAction = (newName: string) => {
-    if (!selectedAction.actionId) return;
-    const event = updateAction(
-      selectedProduct.productId,
-      selectedAction.actionId,
-      { actionName: newName }
-    );
-
-    if (selectedPointData) {
-      const updatedActions = selectedPointData.actions.map((action) =>
-        action.actionUuid === selectedAction.actionId
-          ? { ...action, actionName: newName }
-          : action
-      );
-      setSelectedPointData({
-        ...selectedPointData,
-        actions: updatedActions,
-      });
-    }
-
-    if (event) {
-      updateBackend(
-        selectedProduct.productName,
-        selectedProduct.productId,
-        organization,
-        event
-      );
-    }
-  };
-
-  const handleSpeedChange = (value: string) => {
-    if (!selectedEventData) return;
-    const event = updateEvent(
-      selectedProduct.productId,
-      selectedEventData.data.modelUuid,
-      {
-        speed: parseFloat(value),
-      }
-    );
-
-    if (event) {
-      updateBackend(
-        selectedProduct.productName,
-        selectedProduct.productId,
-        organization,
-        event
-      );
-    }
-  };
-  const handleClearPoints = () => {
-    if (!selectedAction.actionId || !selectedPointData) return;
-
-    const event = updateAction(
-      selectedProduct.productId,
-      selectedAction.actionId,
-      {
-        process: {
-          startPoint: null,
-          endPoint: null,
-        },
-      }
-    );
-
-    if (event) {
-      updateBackend(
-        selectedProduct.productName,
-        selectedProduct.productId,
-        organization,
-        event
-      );
-    }
-  };
-
-  const handleAddAction = () => {
-    if (!selectedEventData || !selectedPointData) return;
-
-    const newAction = {
-      actionUuid: MathUtils.generateUUID(),
-      actionName: `Action ${selectedPointData.actions.length + 1}`,
-      actionType: "pickAndPlace" as const,
-      process: {
-        startPoint: null,
-        endPoint: null,
-      },
-      triggers: [] as TriggerSchema[],
+    const updateBackend = (
+        productName: string,
+        productUuid: string,
+        projectId: string,
+        eventData: EventsSchema
+    ) => {
+        upsertProductOrEventApi({
+            productName: productName,
+            productUuid: productUuid,
+            projectId: projectId,
+            eventDatas: eventData,
+        });
     };
 
-    const event = addAction(
-      selectedProduct.productId,
-      selectedEventData.data.modelUuid,
-      selectedEventData.selectedPoint,
-      newAction
-    );
+    const handleRenameAction = (newName: string) => {
+        if (!selectedAction.actionId) return;
+        const event = updateAction(
+            selectedProduct.productUuid,
+            selectedAction.actionId,
+            { actionName: newName }
+        );
 
-    if (event) {
-      updateBackend(
-        selectedProduct.productName,
-        selectedProduct.productId,
-        organization,
-        event
-      );
-    }
+        if (selectedPointData) {
+            const updatedActions = selectedPointData.actions.map((action) =>
+                action.actionUuid === selectedAction.actionId
+                    ? { ...action, actionName: newName }
+                    : action
+            );
+            setSelectedPointData({
+                ...selectedPointData,
+                actions: updatedActions,
+            });
+        }
 
-    const updatedPoint = {
-      ...selectedPointData,
-      actions: [...selectedPointData.actions, newAction],
+        if (event) {
+            updateBackend(
+                selectedProduct.productName,
+                selectedProduct.productUuid,
+                projectId || '',
+                event
+            );
+        }
     };
-    setSelectedPointData(updatedPoint);
-    setSelectedAction(newAction.actionUuid, newAction.actionName);
-  };
 
-  const handleDeleteAction = (actionUuid: string) => {
-    if (!selectedPointData) return;
+    const handleSpeedChange = (value: string) => {
+        if (!selectedEventData) return;
+        const event = updateEvent(
+            selectedProduct.productUuid,
+            selectedEventData.data.modelUuid,
+            { speed: parseFloat(value), }
+        );
 
-    const event = removeAction(selectedProduct.productId, actionUuid);
-
-    if (event) {
-      updateBackend(
-        selectedProduct.productName,
-        selectedProduct.productId,
-        organization,
-        event
-      );
-    }
-
-    const index = selectedPointData.actions.findIndex(
-      (a) => a.actionUuid === actionUuid
-    );
-    const newActions = selectedPointData.actions.filter(
-      (a) => a.actionUuid !== actionUuid
-    );
-
-    const updatedPoint = {
-      ...selectedPointData,
-      actions: newActions,
+        if (event) {
+            updateBackend(
+                selectedProduct.productName,
+                selectedProduct.productUuid,
+                projectId || '',
+                event
+            );
+        }
     };
-    setSelectedPointData(updatedPoint);
+    const handleClearPoints = () => {
+        if (!selectedAction.actionId || !selectedPointData) return;
 
-    if (selectedAction.actionId === actionUuid) {
-      const nextAction = newActions[index] || newActions[index - 1];
-      if (nextAction) {
-        setSelectedAction(nextAction.actionUuid, nextAction.actionName);
-      } else {
-        clearSelectedAction();
-      }
-    }
-  };
+        const event = updateAction(
+            selectedProduct.productUuid,
+            selectedAction.actionId,
+            {
+                process: {
+                    startPoint: null,
+                    endPoint: null,
+                },
+            }
+        );
 
-  const availableActions = {
-    defaultOption: "pickAndPlace",
-    options: ["pickAndPlace"],
-  };
+        if (event) {
+            updateBackend(
+                selectedProduct.productName,
+                selectedProduct.productUuid,
+                projectId || '',
+                event
+            );
+        }
+    };
 
-  const currentSpeed =
-    (
-      getEventByModelUuid(
-        selectedProduct.productId,
-        selectedEventData?.data.modelUuid || ""
-      ) as RoboticArmEventSchema | undefined
-    )?.speed?.toString() || "0.5";
+    const handleAddAction = () => {
+        if (!selectedEventData || !selectedPointData) return;
 
-  const currentAction = selectedPointData?.actions.find(
-    (a) => a.actionUuid === selectedAction.actionId
-  );
+        const newAction = {
+            actionUuid: MathUtils.generateUUID(),
+            actionName: `Action ${selectedPointData.actions.length + 1}`,
+            actionType: "pickAndPlace" as const,
+            process: {
+                startPoint: null,
+                endPoint: null,
+            },
+            triggers: [] as TriggerSchema[],
+        };
 
-  const currentPickPoint = currentAction?.process.startPoint
-    ? `${currentAction.process.startPoint[0]},${currentAction.process.startPoint[1]},${currentAction.process.startPoint[2]}`
-    : "";
-  const currentPlacePoint = currentAction?.process.endPoint
-    ? `${currentAction.process.endPoint[0]},${currentAction.process.endPoint[1]},${currentAction.process.endPoint[2]}`
-    : "";
+        const event = addAction(
+            selectedProduct.productUuid,
+            selectedEventData.data.modelUuid,
+            selectedEventData.selectedPoint,
+            newAction
+        );
 
-  return (
-    <>
-      <div className="global-props section">
-        <div className="property-list-container">
-          <div className="property-item">
-            <InputWithDropDown
-              label="Speed"
-              value={currentSpeed}
-              min={0}
-              step={0.1}
-              defaultValue={"0.5"}
-              max={10}
-              activeOption="m/s"
-              onClick={() => { }}
-              onChange={handleSpeedChange}
-            />
-          </div>
-        </div>
-      </div>
-      <section>
-        <ActionsList
-          selectedPointData={selectedPointData}
-          multipleAction
-          handleAddAction={handleAddAction}
-          handleDeleteAction={handleDeleteAction}
-        />
+        if (event) {
+            updateBackend(
+                selectedProduct.productName,
+                selectedProduct.productUuid,
+                projectId || '',
+                event
+            );
+        }
 
-        {selectedAction.actionId && currentAction && (
-          <div className="selected-actions-details">
-            <div className="selected-actions-header">
-              <RenameInput
-                value={selectedAction.actionName || ""}
-                onRename={handleRenameAction}
-              />
+        const updatedPoint = { ...selectedPointData, actions: [...selectedPointData.actions, newAction], };
+        setSelectedPointData(updatedPoint);
+        setSelectedAction(newAction.actionUuid, newAction.actionName);
+    };
+
+    const handleDeleteAction = (actionUuid: string) => {
+        if (!selectedPointData) return;
+
+        const event = removeAction(selectedProduct.productUuid, actionUuid);
+
+        if (event) {
+            updateBackend(
+                selectedProduct.productName,
+                selectedProduct.productUuid,
+                projectId || '',
+                event
+            );
+        }
+
+        const index = selectedPointData.actions.findIndex((a) => a.actionUuid === actionUuid);
+        const newActions = selectedPointData.actions.filter((a) => a.actionUuid !== actionUuid);
+
+        const updatedPoint = {
+            ...selectedPointData,
+            actions: newActions,
+        };
+        setSelectedPointData(updatedPoint);
+
+        if (selectedAction.actionId === actionUuid) {
+            const nextAction = newActions[index] || newActions[index - 1];
+            if (nextAction) {
+                setSelectedAction(nextAction.actionUuid, nextAction.actionName);
+            } else {
+                clearSelectedAction();
+            }
+        }
+    };
+
+    const availableActions = {
+        defaultOption: "pickAndPlace",
+        options: ["pickAndPlace"],
+    };
+
+    const currentSpeed = (getEventByModelUuid(selectedProduct.productUuid, selectedEventData?.data.modelUuid || "") as RoboticArmEventSchema | undefined)?.speed?.toString() || "0.5";
+
+    const currentAction = selectedPointData?.actions.find((a) => a.actionUuid === selectedAction.actionId);
+
+    const currentPickPoint = currentAction?.process.startPoint
+        ? `${currentAction.process.startPoint[0]},${currentAction.process.startPoint[1]},${currentAction.process.startPoint[2]}`
+        : "";
+    const currentPlacePoint = currentAction?.process.endPoint
+        ? `${currentAction.process.endPoint[0]},${currentAction.process.endPoint[1]},${currentAction.process.endPoint[2]}`
+        : "";
+
+    return (
+        <>
+            <div className="global-props section">
+                <div className="property-list-container">
+                    <div className="property-item">
+                        <InputWithDropDown
+                            label="Speed"
+                            value={currentSpeed}
+                            min={0}
+                            step={0.1}
+                            defaultValue={"0.5"}
+                            max={10}
+                            activeOption="m/s"
+                            onClick={() => { }}
+                            onChange={handleSpeedChange}
+                        />
+                    </div>
+                </div>
             </div>
-            <div className="selected-actions-list">
-              <LabledDropdown
-                defaultOption={activeOption}
-                options={availableActions.options}
-                onSelect={() => { }}
-                disabled={true}
-              />
-              <PickAndPlaceAction clearPoints={handleClearPoints} />
-            </div>
-            <div className="tirgger">
-              <Trigger
-                selectedPointData={selectedPointData as any}
-                type={"RoboticArm"}
-              />
-            </div>
-          </div>
-        )}
-      </section>
-    </>
-  );
+            <section>
+                <ActionsList
+                    selectedPointData={selectedPointData}
+                    multipleAction
+                    handleAddAction={handleAddAction}
+                    handleDeleteAction={handleDeleteAction}
+                />
+
+                {selectedAction.actionId && currentAction && (
+                    <div className="selected-actions-details">
+                        <div className="selected-actions-header">
+                            <RenameInput
+                                value={selectedAction.actionName || ""}
+                                onRename={handleRenameAction}
+                            />
+                        </div>
+                        <div className="selected-actions-list">
+                            <LabledDropdown
+                                defaultOption={activeOption}
+                                options={availableActions.options}
+                                onSelect={() => { }}
+                                disabled={true}
+                            />
+                            <PickAndPlaceAction clearPoints={handleClearPoints} />
+                        </div>
+                        <div className="tirgger">
+                            <Trigger
+                                selectedPointData={selectedPointData as any}
+                                type={"RoboticArm"}
+                            />
+                        </div>
+                    </div>
+                )}
+            </section>
+        </>
+    );
 }
 
 export default RoboticArmMechanics;
diff --git a/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/storageMechanics.tsx b/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/storageMechanics.tsx
index 2138f07..03260b1 100644
--- a/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/storageMechanics.tsx
+++ b/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/storageMechanics.tsx
@@ -9,6 +9,7 @@ import { useProductStore } from "../../../../../../store/simulation/useProductSt
 import { useSelectedAction, useSelectedEventData } from "../../../../../../store/simulation/useSimulationStore";
 import * as THREE from 'three';
 import { useProductContext } from "../../../../../../modules/simulation/products/productContext";
+import { useParams } from "react-router-dom";
 
 function StorageMechanics() {
     const [activeOption, setActiveOption] = useState<"default" | "store" | "spawn">("default");
@@ -19,13 +20,12 @@ function StorageMechanics() {
     const { selectedProduct } = selectedProductStore();
     const { setSelectedAction, clearSelectedAction } = useSelectedAction();
 
-    const email = localStorage.getItem('email')
-    const organization = (email!.split("@")[1]).split(".")[0];
+    const { projectId } = useParams();
 
     const updateSelectedPointData = () => {
         if (selectedEventData && selectedProduct) {
             const point = getPointByUuid(
-                selectedProduct.productId,
+                selectedProduct.productUuid,
                 selectedEventData?.data.modelUuid,
                 selectedEventData?.selectedPoint
             ) as StoragePointSchema | undefined;
@@ -41,7 +41,7 @@ function StorageMechanics() {
     useEffect(() => {
         if (selectedEventData) {
             const point = getPointByUuid(
-                selectedProduct.productId,
+                selectedProduct.productUuid,
                 selectedEventData?.data.modelUuid,
                 selectedEventData?.selectedPoint
             ) as StoragePointSchema | undefined;
@@ -58,14 +58,14 @@ function StorageMechanics() {
 
     const updateBackend = (
         productName: string,
-        productId: string,
-        organization: string,
+        productUuid: string,
+        projectId: string,
         eventData: EventsSchema
     ) => {
         upsertProductOrEventApi({
             productName: productName,
-            productId: productId,
-            organization: organization,
+            productUuid: productUuid,
+            projectId: projectId,
             eventDatas: eventData
         })
     }
@@ -76,15 +76,15 @@ function StorageMechanics() {
 
         setActiveOption(option as "store" | "spawn");
 
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, {
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, {
             actionType: internalOption,
         });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
             updateSelectedPointData();
@@ -93,13 +93,13 @@ function StorageMechanics() {
 
     const handleRenameAction = (newName: string) => {
         if (!selectedPointData) return;
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, { actionName: newName });
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, { actionName: newName });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
             updateSelectedPointData();
@@ -110,15 +110,15 @@ function StorageMechanics() {
         if (!selectedEventData || !selectedPointData) return;
         const newCapacity = parseInt(value);
 
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, {
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, {
             storageCapacity: newCapacity,
         });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
             updateSelectedPointData();
@@ -137,15 +137,15 @@ function StorageMechanics() {
     const handleMaterialTypeChange = (value: string) => {
         if (!selectedEventData || !selectedPointData) return;
 
-        const event = updateAction(selectedProduct.productId, selectedPointData.action.actionUuid, {
+        const event = updateAction(selectedProduct.productUuid, selectedPointData.action.actionUuid, {
             materialType: value,
         });
 
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
             updateSelectedPointData();
diff --git a/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/vehicleMechanics.tsx b/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/vehicleMechanics.tsx
index 93c1bd8..abe904f 100644
--- a/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/vehicleMechanics.tsx
+++ b/app/src/components/layout/sidebarRight/properties/eventProperties/mechanics/vehicleMechanics.tsx
@@ -12,6 +12,7 @@ import TravelAction from "../actions/TravelAction";
 import ActionsList from "../components/ActionsList";
 import { upsertProductOrEventApi } from "../../../../../../services/simulation/products/UpsertProductOrEventApi";
 import { useProductContext } from "../../../../../../modules/simulation/products/productContext";
+import { useParams } from "react-router-dom";
 
 function VehicleMechanics() {
     const [activeOption, setActiveOption] = useState<"default" | "travel">("default");
@@ -22,13 +23,12 @@ function VehicleMechanics() {
     const { selectedProduct } = selectedProductStore();
     const { setSelectedAction, clearSelectedAction } = useSelectedAction();
 
-    const email = localStorage.getItem("email");
-    const organization = email!.split("@")[1].split(".")[0];
+    const { projectId } = useParams();
 
     useEffect(() => {
         if (selectedEventData && selectedEventData.data.type === "vehicle") {
             const point = getPointByUuid(
-                selectedProduct.productId,
+                selectedProduct.productUuid,
                 selectedEventData.data.modelUuid,
                 selectedEventData.selectedPoint
             ) as VehiclePointSchema | undefined;
@@ -45,14 +45,14 @@ function VehicleMechanics() {
 
     const updateBackend = (
         productName: string,
-        productId: string,
-        organization: string,
+        productUuid: string,
+        projectId: string,
         eventData: EventsSchema
     ) => {
         upsertProductOrEventApi({
             productName: productName,
-            productId: productId,
-            organization: organization,
+            productUuid: productUuid,
+            projectId: projectId,
             eventDatas: eventData,
         });
     };
@@ -60,7 +60,7 @@ function VehicleMechanics() {
     const handleSpeedChange = (value: string) => {
         if (!selectedEventData) return;
         const event = updateEvent(
-            selectedProduct.productId,
+            selectedProduct.productUuid,
             selectedEventData.data.modelUuid,
             {
                 speed: parseFloat(value),
@@ -70,8 +70,8 @@ function VehicleMechanics() {
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
         }
@@ -83,7 +83,7 @@ function VehicleMechanics() {
         setActiveOption(validOption);
 
         const event = updateAction(
-            selectedProduct.productId,
+            selectedProduct.productUuid,
             selectedPointData.action.actionUuid,
             {
                 actionType: validOption,
@@ -93,8 +93,8 @@ function VehicleMechanics() {
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
         }
@@ -103,7 +103,7 @@ function VehicleMechanics() {
     const handleRenameAction = (newName: string) => {
         if (!selectedPointData) return;
         const event = updateAction(
-            selectedProduct.productId,
+            selectedProduct.productUuid,
             selectedPointData.action.actionUuid,
             { actionName: newName }
         );
@@ -111,8 +111,8 @@ function VehicleMechanics() {
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
         }
@@ -121,7 +121,7 @@ function VehicleMechanics() {
     const handleLoadCapacityChange = (value: string) => {
         if (!selectedPointData) return;
         const event = updateAction(
-            selectedProduct.productId,
+            selectedProduct.productUuid,
             selectedPointData.action.actionUuid,
             {
                 loadCapacity: parseFloat(value),
@@ -131,8 +131,8 @@ function VehicleMechanics() {
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
         }
@@ -141,7 +141,7 @@ function VehicleMechanics() {
     const handleUnloadDurationChange = (value: string) => {
         if (!selectedPointData) return;
         const event = updateAction(
-            selectedProduct.productId,
+            selectedProduct.productUuid,
             selectedPointData.action.actionUuid,
             {
                 unLoadDuration: parseFloat(value),
@@ -151,8 +151,8 @@ function VehicleMechanics() {
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
         }
@@ -171,7 +171,7 @@ function VehicleMechanics() {
     const currentSpeed =
         (
             getEventByModelUuid(
-                selectedProduct.productId,
+                selectedProduct.productUuid,
                 selectedEventData?.data.modelUuid || ""
             ) as VehicleEventSchema | undefined
         )?.speed?.toString() || "0.5";
@@ -193,7 +193,7 @@ function VehicleMechanics() {
         if (!selectedEventData || !selectedPointData?.action.actionUuid) return;
 
         const event = updateAction(
-            selectedProduct.productId, selectedPointData.action.actionUuid, {
+            selectedProduct.productUuid, selectedPointData.action.actionUuid, {
             pickUpPoint: null,
             unLoadPoint: null,
             steeringAngle: 0,
@@ -202,8 +202,8 @@ function VehicleMechanics() {
         if (event) {
             updateBackend(
                 selectedProduct.productName,
-                selectedProduct.productId,
-                organization,
+                selectedProduct.productUuid,
+                projectId || '',
                 event
             );
         }
diff --git a/app/src/components/layout/sidebarRight/properties/eventProperties/trigger/Trigger.tsx b/app/src/components/layout/sidebarRight/properties/eventProperties/trigger/Trigger.tsx
index d94b553..c677d9f 100644
--- a/app/src/components/layout/sidebarRight/properties/eventProperties/trigger/Trigger.tsx
+++ b/app/src/components/layout/sidebarRight/properties/eventProperties/trigger/Trigger.tsx
@@ -1,512 +1,442 @@
 import React, { useEffect, useMemo, useRef, useState } from "react";
 import * as THREE from "three";
-import {
-  AddIcon,
-  RemoveIcon,
-  ResizeHeightIcon,
-} from "../../../../../icons/ExportCommonIcons";
+import { AddIcon, RemoveIcon, ResizeHeightIcon } from "../../../../../icons/ExportCommonIcons";
 import LabledDropdown from "../../../../../ui/inputs/LabledDropdown";
 import RenameInput from "../../../../../ui/inputs/RenameInput";
 import { handleResize } from "../../../../../../functions/handleResizePannel";
 import { useProductStore } from "../../../../../../store/simulation/useProductStore";
-import {
-  useSelectedAction,
-} from "../../../../../../store/simulation/useSimulationStore";
+import { useSelectedAction } from "../../../../../../store/simulation/useSimulationStore";
 import { upsertProductOrEventApi } from "../../../../../../services/simulation/products/UpsertProductOrEventApi";
 import { useProductContext } from "../../../../../../modules/simulation/products/productContext";
+import { useParams } from "react-router-dom";
 
 type TriggerProps = {
-  selectedPointData?: PointsScheme | undefined;
-  type?: "Conveyor" | "Vehicle" | "RoboticArm" | "Machine" | "StorageUnit";
+    selectedPointData?: PointsScheme | undefined;
+    type?: "Conveyor" | "Vehicle" | "RoboticArm" | "Machine" | "StorageUnit";
 };
 
 const Trigger = ({ selectedPointData, type }: TriggerProps) => {
-  const [currentAction, setCurrentAction] = useState<string | undefined>();
-  const { selectedProductStore } = useProductContext();
-  const { selectedProduct } = selectedProductStore();
-  const {
-    getActionByUuid,
-    getEventByModelUuid,
-    getPointByUuid,
-    getTriggerByUuid,
-    addTrigger,
-    removeTrigger,
-    updateTrigger,
-    renameTrigger,
-    getProductById,
-  } = useProductStore();
-  const [triggers, setTriggers] = useState<TriggerSchema[]>([]);
-  const [selectedTrigger, setSelectedTrigger] = useState<
-    TriggerSchema | undefined
-  >();
-  const [activeOption, setActiveOption] = useState<
-    "onComplete" | "onStart" | "onStop" | "delay" | "onError"
-  >("onComplete");
-  const triggersContainerRef = useRef<HTMLDivElement>(null);
-  const { selectedAction } = useSelectedAction();
+    const [currentAction, setCurrentAction] = useState<string | undefined>();
+    const { selectedProductStore } = useProductContext();
+    const { selectedProduct } = selectedProductStore();
+    const { getActionByUuid, getEventByModelUuid, getPointByUuid, getTriggerByUuid, addTrigger, removeTrigger, updateTrigger, renameTrigger, getProductById, } = useProductStore();
+    const [triggers, setTriggers] = useState<TriggerSchema[]>([]);
+    const [selectedTrigger, setSelectedTrigger] = useState<TriggerSchema | undefined>();
+    const [activeOption, setActiveOption] = useState<"onComplete" | "onStart" | "onStop" | "delay" | "onError">("onComplete");
+    const triggersContainerRef = useRef<HTMLDivElement>(null);
+    const { selectedAction } = useSelectedAction();
 
-  const email = localStorage.getItem("email");
-  const organization = email!.split("@")[1].split(".")[0];
+    const { projectId } = useParams();
 
-  useEffect(() => {
-    if (!selectedPointData || !selectedProduct) return;
+    useEffect(() => {
+        if (!selectedPointData || !selectedProduct) return;
 
-    let actionUuid: string | undefined;
+        let actionUuid: string | undefined;
 
-    if (
-      type === "Conveyor" ||
-      type === "Vehicle" ||
-      type === "Machine" ||
-      type === "StorageUnit"
-    ) {
-      actionUuid = (
-        selectedPointData as
-        | ConveyorPointSchema
-        | VehiclePointSchema
-        | MachinePointSchema
-        | StoragePointSchema
-      ).action?.actionUuid;
-    } else if (
-      type === "RoboticArm" &&
-      selectedAction &&
-      selectedAction.actionId
-    ) {
-      actionUuid = selectedAction.actionId;
-    }
+        if (type === "Conveyor" || type === "Vehicle" || type === "Machine" || type === "StorageUnit") {
+            actionUuid = (selectedPointData as | ConveyorPointSchema | VehiclePointSchema | MachinePointSchema | StoragePointSchema).action?.actionUuid;
+        } else if (type === "RoboticArm" && selectedAction.actionId) {
+            actionUuid = selectedAction.actionId;
+        }
 
-    setCurrentAction(actionUuid);
-  }, [selectedPointData, selectedProduct, type, selectedAction]);
+        setCurrentAction(actionUuid);
+    }, [selectedPointData, selectedProduct, type, selectedAction]);
 
-  const updateBackend = (
-    productName: string,
-    productId: string,
-    organization: string,
-    eventData: EventsSchema
-  ) => {
-    upsertProductOrEventApi({
-      productName: productName,
-      productId: productId,
-      organization: organization,
-      eventDatas: eventData,
-    });
-  };
-
-  useEffect(() => {
-    if (!currentAction || !selectedProduct) return;
-    const action = getActionByUuid(selectedProduct.productId, currentAction);
-    const actionTriggers = action?.triggers || [];
-    setTriggers(actionTriggers);
-    setSelectedTrigger(actionTriggers[0]);
-  }, [currentAction, selectedProduct]);
-
-  const triggeredModel = useMemo(() => {
-    if (
-      !selectedProduct ||
-      !selectedTrigger?.triggeredAsset?.triggeredModel?.modelUuid
-    )
-      return undefined;
-    return getEventByModelUuid(
-      selectedProduct.productId,
-      selectedTrigger.triggeredAsset.triggeredModel.modelUuid
-    );
-  }, [selectedProduct, selectedTrigger]);
-
-  const triggeredPoint = useMemo(() => {
-    if (
-      !selectedProduct ||
-      !triggeredModel ||
-      !selectedTrigger?.triggeredAsset?.triggeredPoint?.pointUuid
-    )
-      return undefined;
-    return getPointByUuid(
-      selectedProduct.productId,
-      triggeredModel.modelUuid,
-      selectedTrigger.triggeredAsset.triggeredPoint.pointUuid
-    );
-  }, [selectedProduct, triggeredModel, selectedTrigger]);
-
-  const triggeredAction = useMemo(() => {
-    if (
-      !selectedProduct ||
-      !selectedTrigger?.triggeredAsset?.triggeredAction?.actionUuid
-    )
-      return undefined;
-    return getActionByUuid(
-      selectedProduct.productId,
-      selectedTrigger.triggeredAsset.triggeredAction.actionUuid
-    );
-  }, [selectedProduct, selectedTrigger]);
-
-  const modelOptions =
-    getProductById(selectedProduct.productId)?.eventDatas || [];
-
-  const pointOptions: PointsScheme[] = useMemo(() => {
-    if (!triggeredModel) return [];
-
-    const model = modelOptions.find(
-      (m) => m.modelUuid === triggeredModel.modelUuid
-    );
-    if (!model) return [];
-
-    if ("points" in model) {
-      return (model as ConveyorEventSchema).points;
-    } else if ("point" in model) {
-      return [
-        (
-          model as
-          | VehicleEventSchema
-          | RoboticArmEventSchema
-          | MachineEventSchema
-          | StorageEventSchema
-        ).point,
-      ];
-    }
-    return [];
-  }, [triggeredModel, modelOptions]);
-
-  const actionOptions: any = useMemo(() => {
-    if (!triggeredPoint) return [];
-    const point = pointOptions.find((p) => p.uuid === triggeredPoint.uuid);
-    if (!point) return [];
-
-    if ("action" in point) {
-      const typedPoint = point as
-        | ConveyorPointSchema
-        | VehiclePointSchema
-        | MachinePointSchema
-        | StoragePointSchema;
-      return typedPoint.action ? [typedPoint.action] : [];
-    } else if ("actions" in point) {
-      const typedPoint = point as RoboticArmPointSchema;
-      return typedPoint.actions;
-    }
-    return [];
-  }, [triggeredPoint, pointOptions]);
-
-  const handleModelSelect = (option: string, triggerUuid: string) => {
-    if (!selectedProduct) return;
-
-    const selectedModel = modelOptions.find((m) => m.modelName === option);
-    if (!selectedModel) return;
-
-    const event = updateTrigger(selectedProduct.productId, triggerUuid, {
-      triggeredAsset: {
-        triggeredModel: {
-          modelName: selectedModel.modelName,
-          modelUuid: selectedModel.modelUuid,
-        },
-        triggeredPoint: null,
-        triggeredAction: null,
-      },
-    });
-
-    if (event) {
-      const updatedTrigger = getTriggerByUuid(
-        selectedProduct.productId,
-        triggerUuid
-      );
-      setSelectedTrigger(updatedTrigger);
-
-      updateBackend(
-        selectedProduct.productName,
-        selectedProduct.productId,
-        organization,
-        event
-      );
-    }
-  };
-
-  const handlePointSelect = (option: string, triggerUuid: string) => {
-    if (!selectedProduct || !selectedTrigger) return;
-
-    const pointUuid = pointOptions.find(
-      (p) => `Point ${p.uuid.slice(0, 4)}` === option
-    )?.uuid;
-    if (!pointUuid) return;
-
-    if (selectedTrigger.triggeredAsset?.triggeredModel) {
-      const event = updateTrigger(selectedProduct.productId, triggerUuid, {
-        triggeredAsset: {
-          ...selectedTrigger.triggeredAsset,
-          triggeredPoint: {
-            pointName: option,
-            pointUuid: pointUuid,
-          },
-          triggeredAction: null,
-        },
-      });
-
-      if (event) {
-        const updatedTrigger = getTriggerByUuid(
-          selectedProduct.productId,
-          triggerUuid
-        );
-        setSelectedTrigger(updatedTrigger);
-
-        updateBackend(
-          selectedProduct.productName,
-          selectedProduct.productId,
-          organization,
-          event
-        );
-      }
-    }
-  };
-
-  const handleActionSelect = (option: string, triggerUuid: string) => {
-    if (!selectedProduct || !selectedTrigger) return;
-
-    const selectedAction = actionOptions.find(
-      (a: any) => a.actionName === option
-    );
-
-    if (!selectedAction) return;
-
-    if (selectedTrigger.triggeredAsset?.triggeredPoint) {
-      const event = updateTrigger(selectedProduct.productId, triggerUuid, {
-        triggeredAsset: {
-          ...selectedTrigger.triggeredAsset,
-          triggeredAction: {
-            actionName: option,
-            actionUuid: selectedAction.actionUuid,
-          },
-        },
-      });
-
-      if (event) {
-        updateBackend(
-          selectedProduct.productName,
-          selectedProduct.productId,
-          organization,
-          event
-        );
-      }
-    }
-  };
-
-  const handleAddTrigger = () => {
-    if (!selectedProduct || !currentAction) return;
-
-    const newTrigger: TriggerSchema = {
-      triggerUuid: THREE.MathUtils.generateUUID(),
-      triggerName: `New Trigger ${triggers.length + 1}`,
-      triggerType: activeOption,
-      delay: 0,
-      triggeredAsset: null,
+    const updateBackend = (
+        productName: string,
+        productUuid: string,
+        projectId: string,
+        eventData: EventsSchema
+    ) => {
+        upsertProductOrEventApi({
+            productName: productName,
+            productUuid: productUuid,
+            projectId: projectId,
+            eventDatas: eventData,
+        });
     };
 
-    const event = addTrigger(
-      selectedProduct.productId,
-      currentAction,
-      newTrigger
-    );
+    useEffect(() => {
+        if (!currentAction || !selectedProduct) return;
+        const action = getActionByUuid(selectedProduct.productUuid, currentAction);
+        const actionTriggers = action?.triggers || [];
+        setTriggers(actionTriggers);
+        setSelectedTrigger(actionTriggers[0]);
+    }, [currentAction, selectedProduct]);
 
-    if (event) {
-      updateBackend(
-        selectedProduct.productName,
-        selectedProduct.productId,
-        organization,
-        event
-      );
-    }
+    const triggeredModel = useMemo(() => {
+        if (!selectedProduct || !selectedTrigger?.triggeredAsset?.triggeredModel?.modelUuid)
+            return undefined;
+        return getEventByModelUuid(
+            selectedProduct.productUuid,
+            selectedTrigger.triggeredAsset.triggeredModel.modelUuid
+        );
+    }, [selectedProduct, selectedTrigger]);
 
-    const updatedAction = getActionByUuid(
-      selectedProduct.productId,
-      currentAction
-    );
-    const updatedTriggers = updatedAction?.triggers || [];
+    const triggeredPoint = useMemo(() => {
+        if (!selectedProduct || !triggeredModel || !selectedTrigger?.triggeredAsset?.triggeredPoint?.pointUuid)
+            return undefined;
+        return getPointByUuid(
+            selectedProduct.productUuid,
+            triggeredModel.modelUuid,
+            selectedTrigger.triggeredAsset.triggeredPoint.pointUuid
+        );
+    }, [selectedProduct, triggeredModel, selectedTrigger]);
 
-    setTriggers(updatedTriggers);
-    setSelectedTrigger(newTrigger);
-  };
+    const triggeredAction = useMemo(() => {
+        if (!selectedProduct || !selectedTrigger?.triggeredAsset?.triggeredAction?.actionUuid)
+            return undefined;
+        return getActionByUuid(
+            selectedProduct.productUuid,
+            selectedTrigger.triggeredAsset.triggeredAction.actionUuid
+        );
+    }, [selectedProduct, selectedTrigger]);
 
-  const handleRemoveTrigger = (triggerUuid: string) => {
-    if (!selectedProduct || !currentAction) return;
+    const modelOptions = getProductById(selectedProduct.productUuid)?.eventDatas || [];
 
-    const event = removeTrigger(selectedProduct.productId, triggerUuid);
+    const pointOptions: PointsScheme[] = useMemo(() => {
+        if (!triggeredModel) return [];
 
-    if (event) {
-      updateBackend(
-        selectedProduct.productName,
-        selectedProduct.productId,
-        organization,
-        event
-      );
-    }
+        const model = modelOptions.find((m) => m.modelUuid === triggeredModel.modelUuid);
+        if (!model) return [];
 
-    const index = triggers.findIndex((t) => t.triggerUuid === triggerUuid);
-    const newTriggers = triggers.filter((t) => t.triggerUuid !== triggerUuid);
-    setTriggers(newTriggers);
+        if ("points" in model) {
+            return (model).points;
+        } else if ("point" in model) {
+            return [model.point];
+        }
+        return [];
+    }, [triggeredModel, modelOptions]);
 
-    if (selectedTrigger?.triggerUuid === triggerUuid) {
-      const nextTrigger = newTriggers[index] || newTriggers[index - 1];
-      setSelectedTrigger(nextTrigger);
-    }
-  };
+    const actionOptions: any = useMemo(() => {
+        if (!triggeredPoint) return [];
+        const point = pointOptions.find((p) => p.uuid === triggeredPoint.uuid);
+        if (!point) return [];
 
-  const handleTriggerRename = (triggerUuid: string, newName: string) => {
-    if (!selectedProduct) return;
-    const event = renameTrigger(
-      selectedProduct.productId,
-      triggerUuid,
-      newName
-    );
+        if ("action" in point) {
+            const typedPoint = point;
+            return typedPoint.action ? [typedPoint.action] : [];
+        } else if ("actions" in point) {
+            const typedPoint = point;
+            return typedPoint.actions;
+        }
+        return [];
+    }, [triggeredPoint, pointOptions]);
 
-    if (event) {
-      updateBackend(
-        selectedProduct.productName,
-        selectedProduct.productId,
-        organization,
-        event
-      );
-    }
-  };
+    const handleModelSelect = (option: string, triggerUuid: string) => {
+        if (!selectedProduct) return;
 
-  const handleTriggerTypeChange = (option: string) => {
-    if (!selectedTrigger || !selectedProduct) return;
+        const selectedModel = modelOptions.find((m) => m.modelName === option);
+        if (!selectedModel) return;
 
-    const validTypes: Array<TriggerSchema["triggerType"]> = [
-      "onComplete",
-      "onStart",
-      "onStop",
-      "delay",
-      "onError",
-    ];
-    if (!validTypes.includes(option as TriggerSchema["triggerType"])) return;
+        const event = updateTrigger(selectedProduct.productUuid, triggerUuid, {
+            triggeredAsset: {
+                triggeredModel: {
+                    modelName: selectedModel.modelName,
+                    modelUuid: selectedModel.modelUuid,
+                },
+                triggeredPoint: null,
+                triggeredAction: null,
+            },
+        });
 
-    setActiveOption(option as TriggerSchema["triggerType"]);
-    const event = updateTrigger(
-      selectedProduct.productId,
-      selectedTrigger.triggerUuid,
-      {
-        triggerType: option as TriggerSchema["triggerType"],
-      }
-    );
+        if (event) {
+            const updatedTrigger = getTriggerByUuid(
+                selectedProduct.productUuid,
+                triggerUuid
+            );
+            setSelectedTrigger(updatedTrigger);
 
-    if (event) {
-      updateBackend(
-        selectedProduct.productName,
-        selectedProduct.productId,
-        organization,
-        event
-      );
-    }
-  };
+            updateBackend(
+                selectedProduct.productName,
+                selectedProduct.productUuid,
+                projectId || '',
+                event
+            );
+        }
+    };
 
-  return (
-    <div className="trigger-wrapper">
-      <div className="header">
-        <div className="title">Trigger</div>
-        <button
-          id="add-trigger-button"
-          className="add-button"
-          onClick={handleAddTrigger}
-          style={{ cursor: "pointer" }}
-          disabled={!currentAction}
-        >
-          <AddIcon /> Add
-        </button>
-      </div>
-      <div className="trigger-list">
-        <div
-          className="lists-main-container"
-          ref={triggersContainerRef}
-          style={{ height: "120px" }}
-        >
-          <div className="list-container">
-            {triggers.map((trigger) => (
-              <div
-                key={trigger.triggerUuid}
-                className={`list-item ${selectedTrigger?.triggerUuid === trigger.triggerUuid
-                    ? "active"
-                    : ""
-                  }`}
-                onClick={() => setSelectedTrigger(trigger)}
-              >
-                <button id="trigger" className="value">
-                  <RenameInput
-                    value={trigger.triggerName}
-                    onRename={(newName) =>
-                      handleTriggerRename(trigger.triggerUuid, newName)
-                    }
-                  />
+    const handlePointSelect = (option: string, triggerUuid: string) => {
+        if (!selectedProduct || !selectedTrigger) return;
+
+        const pointUuid = pointOptions.find((p) => `Point ${p.uuid.slice(0, 4)}` === option)?.uuid;
+        if (!pointUuid) return;
+
+        if (selectedTrigger.triggeredAsset?.triggeredModel) {
+            const event = updateTrigger(selectedProduct.productUuid, triggerUuid, {
+                triggeredAsset: {
+                    ...selectedTrigger.triggeredAsset,
+                    triggeredPoint: {
+                        pointName: option,
+                        pointUuid: pointUuid,
+                    },
+                    triggeredAction: null,
+                },
+            });
+
+            if (event) {
+                const updatedTrigger = getTriggerByUuid(
+                    selectedProduct.productUuid,
+                    triggerUuid
+                );
+                setSelectedTrigger(updatedTrigger);
+
+                updateBackend(
+                    selectedProduct.productName,
+                    selectedProduct.productUuid,
+                    projectId || '',
+                    event
+                );
+            }
+        }
+    };
+
+    const handleActionSelect = (option: string, triggerUuid: string) => {
+        if (!selectedProduct || !selectedTrigger) return;
+
+        const selectedAction = actionOptions.find((a: any) => a.actionName === option);
+
+        if (!selectedAction) return;
+
+        if (selectedTrigger.triggeredAsset?.triggeredPoint) {
+            const event = updateTrigger(selectedProduct.productUuid, triggerUuid, {
+                triggeredAsset: {
+                    ...selectedTrigger.triggeredAsset,
+                    triggeredAction: {
+                        actionName: option,
+                        actionUuid: selectedAction.actionUuid,
+                    },
+                },
+            });
+
+            if (event) {
+                updateBackend(
+                    selectedProduct.productName,
+                    selectedProduct.productUuid,
+                    projectId || '',
+                    event
+                );
+            }
+        }
+    };
+
+    const handleAddTrigger = () => {
+        if (!selectedProduct || !currentAction) return;
+
+        const newTrigger: TriggerSchema = {
+            triggerUuid: THREE.MathUtils.generateUUID(),
+            triggerName: `New Trigger ${triggers.length + 1}`,
+            triggerType: activeOption,
+            delay: 0,
+            triggeredAsset: null,
+        };
+
+        const event = addTrigger(
+            selectedProduct.productUuid,
+            currentAction,
+            newTrigger
+        );
+
+        if (event) {
+            updateBackend(
+                selectedProduct.productName,
+                selectedProduct.productUuid,
+                projectId || '',
+                event
+            );
+        }
+
+        const updatedAction = getActionByUuid(
+            selectedProduct.productUuid,
+            currentAction
+        );
+        const updatedTriggers = updatedAction?.triggers || [];
+
+        setTriggers(updatedTriggers);
+        setSelectedTrigger(newTrigger);
+    };
+
+    const handleRemoveTrigger = (triggerUuid: string) => {
+        if (!selectedProduct || !currentAction) return;
+
+        const event = removeTrigger(selectedProduct.productUuid, triggerUuid);
+
+        if (event) {
+            updateBackend(
+                selectedProduct.productName,
+                selectedProduct.productUuid,
+                projectId || '',
+                event
+            );
+        }
+
+        const index = triggers.findIndex((t) => t.triggerUuid === triggerUuid);
+        const newTriggers = triggers.filter((t) => t.triggerUuid !== triggerUuid);
+        setTriggers(newTriggers);
+
+        if (selectedTrigger?.triggerUuid === triggerUuid) {
+            const nextTrigger = newTriggers[index] || newTriggers[index - 1];
+            setSelectedTrigger(nextTrigger);
+        }
+    };
+
+    const handleTriggerRename = (triggerUuid: string, newName: string) => {
+        if (!selectedProduct) return;
+        const event = renameTrigger(
+            selectedProduct.productUuid,
+            triggerUuid,
+            newName
+        );
+
+        if (event) {
+            updateBackend(
+                selectedProduct.productName,
+                selectedProduct.productUuid,
+                projectId || '',
+                event
+            );
+        }
+    };
+
+    const handleTriggerTypeChange = (option: string) => {
+        if (!selectedTrigger || !selectedProduct) return;
+
+        const validTypes: Array<TriggerSchema["triggerType"]> = ["onComplete", "onStart", "onStop", "delay", "onError",];
+        if (!validTypes.includes(option as TriggerSchema["triggerType"])) return;
+
+        setActiveOption(option as TriggerSchema["triggerType"]);
+        const event = updateTrigger(
+            selectedProduct.productUuid,
+            selectedTrigger.triggerUuid,
+            {
+                triggerType: option as TriggerSchema["triggerType"],
+            }
+        );
+
+        if (event) {
+            updateBackend(
+                selectedProduct.productName,
+                selectedProduct.productUuid,
+                projectId || '',
+                event
+            );
+        }
+    };
+
+    return (
+        <div className="trigger-wrapper">
+            <div className="header">
+                <div className="title">Trigger</div>
+                <button
+                    id="add-trigger-button"
+                    className="add-button"
+                    onClick={handleAddTrigger}
+                    style={{ cursor: "pointer" }}
+                    disabled={!currentAction}
+                >
+                    <AddIcon /> Add
                 </button>
-                {triggers.length > 1 && (
-                  <button
-                    id="remove-trigger-button"
-                    className="remove-button"
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      handleRemoveTrigger(trigger.triggerUuid);
-                    }}
-                  >
-                    <RemoveIcon />
-                  </button>
-                )}
-              </div>
-            ))}
-          </div>
-          <button
-            className="resize-icon"
-            id="action-resize"
-            onMouseDown={(e: any) => handleResize(e, triggersContainerRef)}
-          >
-            <ResizeHeightIcon />
-          </button>
-        </div>
-
-        {selectedTrigger && (
-          <div className="trigger-item">
-            <div className="trigger-name">{selectedTrigger.triggerName}</div>
-            <LabledDropdown
-              label="Trigger Type"
-              defaultOption={selectedTrigger.triggerType}
-              // options={["onComplete", "onStart", "onStop", "delay", "onError"]}
-              options={["onComplete"]}
-              onSelect={handleTriggerTypeChange}
-            />
-
-            <div className="trigger-options">
-              <LabledDropdown
-                label="Triggered Object"
-                defaultOption={triggeredModel?.modelName || ""}
-                options={[...modelOptions.map((option) => option.modelName)]}
-                onSelect={(option) => {
-                  handleModelSelect(option, selectedTrigger.triggerUuid);
-                }}
-              />
-              <LabledDropdown
-                label="Triggered Point"
-                defaultOption={
-                  triggeredPoint?.uuid
-                    ? `Point ${triggeredPoint?.uuid.slice(0, 4)}`
-                    : ""
-                }
-                options={[
-                  ...pointOptions.map(
-                    (option) => `Point ${option.uuid.slice(0, 4)}`
-                  ),
-                ]}
-                onSelect={(option) => {
-                  handlePointSelect(option, selectedTrigger.triggerUuid);
-                }}
-              />
-              <LabledDropdown
-                label="Triggered Action"
-                defaultOption={triggeredAction?.actionName || ""}
-                options={[
-                  ...actionOptions.map((option: any) => option.actionName),
-                ]}
-                onSelect={(option) => {
-                  handleActionSelect(option, selectedTrigger.triggerUuid);
-                }}
-              />
             </div>
-          </div>
-        )}
-      </div>
-    </div>
-  );
+            <div className="trigger-list">
+                <div
+                    className="lists-main-container"
+                    ref={triggersContainerRef}
+                    style={{ height: "120px" }}
+                >
+                    <div className="list-container">
+                        {triggers.map((trigger) => (
+                            <div
+                                key={trigger.triggerUuid}
+                                className={`list-item ${selectedTrigger?.triggerUuid === trigger.triggerUuid
+                                    ? "active"
+                                    : ""
+                                    }`}
+                                onClick={() => setSelectedTrigger(trigger)}
+                            >
+                                <button id="trigger" className="value">
+                                    <RenameInput
+                                        value={trigger.triggerName}
+                                        onRename={(newName) =>
+                                            handleTriggerRename(trigger.triggerUuid, newName)
+                                        }
+                                    />
+                                </button>
+                                {triggers.length > 1 && (
+                                    <button
+                                        id="remove-trigger-button"
+                                        className="remove-button"
+                                        onClick={(e) => {
+                                            e.stopPropagation();
+                                            handleRemoveTrigger(trigger.triggerUuid);
+                                        }}
+                                    >
+                                        <RemoveIcon />
+                                    </button>
+                                )}
+                            </div>
+                        ))}
+                    </div>
+                    <button
+                        className="resize-icon"
+                        id="action-resize"
+                        onMouseDown={(e: any) => handleResize(e, triggersContainerRef)}
+                    >
+                        <ResizeHeightIcon />
+                    </button>
+                </div>
+
+                {selectedTrigger && (
+                    <div className="trigger-item">
+                        <div className="trigger-name">{selectedTrigger.triggerName}</div>
+                        <LabledDropdown
+                            label="Trigger Type"
+                            defaultOption={selectedTrigger.triggerType}
+                            // options={["onComplete", "onStart", "onStop", "delay", "onError"]}
+                            options={["onComplete"]}
+                            onSelect={handleTriggerTypeChange}
+                        />
+
+                        <div className="trigger-options">
+                            <LabledDropdown
+                                label="Triggered Object"
+                                defaultOption={triggeredModel?.modelName || ""}
+                                options={[...modelOptions.map((option) => option.modelName)]}
+                                onSelect={(option) => {
+                                    handleModelSelect(option, selectedTrigger.triggerUuid);
+                                }}
+                            />
+                            <LabledDropdown
+                                label="Triggered Point"
+                                defaultOption={
+                                    triggeredPoint?.uuid
+                                        ? `Point ${triggeredPoint?.uuid.slice(0, 4)}`
+                                        : ""
+                                }
+                                options={[
+                                    ...pointOptions.map(
+                                        (option) => `Point ${option.uuid.slice(0, 4)}`
+                                    ),
+                                ]}
+                                onSelect={(option) => {
+                                    handlePointSelect(option, selectedTrigger.triggerUuid);
+                                }}
+                            />
+                            <LabledDropdown
+                                label="Triggered Action"
+                                defaultOption={triggeredAction?.actionName || ""}
+                                options={[
+                                    ...actionOptions.map((option: any) => option.actionName),
+                                ]}
+                                onSelect={(option) => {
+                                    handleActionSelect(option, selectedTrigger.triggerUuid);
+                                }}
+                            />
+                        </div>
+                    </div>
+                )}
+            </div>
+        </div>
+    );
 };
 
 export default Trigger;
diff --git a/app/src/components/layout/sidebarRight/simulation/Simulations.tsx b/app/src/components/layout/sidebarRight/simulation/Simulations.tsx
index 8e10a28..c6c76b1 100644
--- a/app/src/components/layout/sidebarRight/simulation/Simulations.tsx
+++ b/app/src/components/layout/sidebarRight/simulation/Simulations.tsx
@@ -1,15 +1,8 @@
 import React, { useEffect, useRef, useState } from "react";
-import {
-  AddIcon,
-  ArrowIcon,
-  RemoveIcon,
-  ResizeHeightIcon,
-} from "../../../icons/ExportCommonIcons";
+import { AddIcon, ArrowIcon, RemoveIcon, ResizeHeightIcon, } from "../../../icons/ExportCommonIcons";
 import RenameInput from "../../../ui/inputs/RenameInput";
 import { handleResize } from "../../../../functions/handleResizePannel";
-import {
-  useSelectedAsset,
-} from "../../../../store/simulation/useSimulationStore";
+import { useSelectedAsset } from "../../../../store/simulation/useSimulationStore";
 import { useProductStore } from "../../../../store/simulation/useProductStore";
 import { generateUUID } from "three/src/math/MathUtils";
 import RenderOverlay from "../../../templates/Overlay";
@@ -22,273 +15,264 @@ import { deleteProductApi } from "../../../../services/simulation/products/delet
 import { renameProductApi } from "../../../../services/simulation/products/renameProductApi";
 import { determineExecutionMachineSequences } from "../../../../modules/simulation/simulator/functions/determineExecutionMachineSequences";
 import ComparePopUp from "../../../ui/compareVersion/Compare";
-import {
-  useCompareStore,
-  useSaveVersion,
-} from "../../../../store/builder/store";
-import CompareLayOut from "../../../ui/compareVersion/CompareLayOut";
+import { useCompareStore, useSaveVersion, } from "../../../../store/builder/store";
 import { useToggleStore } from "../../../../store/useUIToggleStore";
 import { useProductContext } from "../../../../modules/simulation/products/productContext";
+import { useParams } from "react-router-dom";
 
 interface Event {
-  modelName: string;
-  modelId: string;
+    modelName: string;
+    modelId: string;
 }
 
 interface ListProps {
-  val: Event;
+    val: Event;
 }
 
 const List: React.FC<ListProps> = ({ val }) => {
-  return (
-    <div className="process-container">
-      <div className="value">{val.modelName}</div>
-    </div>
-  );
+    return (
+        <div className="process-container">
+            <div className="value">{val.modelName}</div>
+        </div>
+    );
 };
 
 const Simulations: React.FC = () => {
-  const productsContainerRef = useRef<HTMLDivElement>(null);
-  const {
-    products,
-    addProduct,
-    removeProduct,
-    renameProduct,
-    addEvent,
-    removeEvent,
-    getProductById,
-  } = useProductStore();
-  const { selectedProductStore } = useProductContext();
-  const { selectedProduct, setSelectedProduct } = selectedProductStore();
-  const { getEventByModelUuid } = useEventsStore();
-  const { selectedAsset, clearSelectedAsset } = useSelectedAsset();
-  const email = localStorage.getItem("email");
-  const organization = email!.split("@")[1].split(".")[0];
-  const [openObjects, setOpenObjects] = useState(true);
-  const [processes, setProcesses] = useState<Event[][]>();
-  const { setToggleUI } = useToggleStore();
+    const productsContainerRef = useRef<HTMLDivElement>(null);
+    const { products, addProduct, removeProduct, renameProduct, addEvent, removeEvent, getProductById, } = useProductStore();
+    const { selectedProductStore } = useProductContext();
+    const { selectedProduct, setSelectedProduct } = selectedProductStore();
+    const { getEventByModelUuid } = useEventsStore();
+    const { selectedAsset, clearSelectedAsset } = useSelectedAsset();
+    const [openObjects, setOpenObjects] = useState(true);
+    const [processes, setProcesses] = useState<Event[][]>();
+    const { setToggleUI } = useToggleStore();
+    const { projectId } = useParams();
 
-  const { comparePopUp, setComparePopUp } = useCompareStore();
-  const { isVersionSaved, setIsVersionSaved } = useSaveVersion();
+    const { comparePopUp, setComparePopUp } = useCompareStore();
+    const { setIsVersionSaved } = useSaveVersion();
 
-  const handleSaveVersion = () => {
-    setIsVersionSaved(true);
-    setComparePopUp(false);
-    setToggleUI(false, false);
-  };
+    const handleSaveVersion = () => {
+        setIsVersionSaved(true);
+        setComparePopUp(false);
+        setToggleUI(false, false);
+    };
 
-  const handleAddProduct = () => {
-    const id = generateUUID();
-    const name = `Product ${products.length + 1}`;
-    addProduct(name, id);
-    upsertProductOrEventApi({
-      productName: name,
-      productId: id,
-      organization: organization,
-    });
-  };
+    const handleAddProduct = () => {
+        const id = generateUUID();
+        const name = `Product ${products.length + 1}`;
+        addProduct(name, id);
+        upsertProductOrEventApi({
+            productName: name,
+            productUuid: id,
+            projectId: projectId,
+        });
+    };
 
-  const handleRemoveProduct = (productId: string) => {
-    const currentIndex = products.findIndex((p) => p.productId === productId);
-    const isSelected = selectedProduct.productId === productId;
+    const handleRemoveProduct = (productUuid: string) => {
+        const currentIndex = products.findIndex((p) => p.productUuid === productUuid);
+        const isSelected = selectedProduct.productUuid === productUuid;
 
-    const updatedProducts = products.filter((p) => p.productId !== productId);
+        const updatedProducts = products.filter((p) => p.productUuid !== productUuid);
 
-    if (isSelected) {
-      if (updatedProducts.length > 0) {
-        let newSelectedIndex = currentIndex;
-        if (currentIndex >= updatedProducts.length) {
-          newSelectedIndex = updatedProducts.length - 1;
+        if (isSelected) {
+            if (updatedProducts.length > 0) {
+                let newSelectedIndex = currentIndex;
+                if (currentIndex >= updatedProducts.length) {
+                    newSelectedIndex = updatedProducts.length - 1;
+                }
+                setSelectedProduct(
+                    updatedProducts[newSelectedIndex].productUuid,
+                    updatedProducts[newSelectedIndex].productName
+                );
+            } else {
+                setSelectedProduct("", "");
+            }
         }
-        setSelectedProduct(
-          updatedProducts[newSelectedIndex].productId,
-          updatedProducts[newSelectedIndex].productName
-        );
-      } else {
-        setSelectedProduct("", "");
-      }
-    }
 
-    removeProduct(productId);
-    deleteProductApi(productId, organization);
-  };
+        removeProduct(productUuid);
+        deleteProductApi({
+            productUuid,
+            projectId
+        });
+    };
 
-  const handleRenameProduct = (productId: string, newName: string) => {
-    renameProduct(productId, newName);
-    renameProductApi({ productName: newName, productId, organization });
-    if (selectedProduct.productId === productId) {
-      setSelectedProduct(productId, newName);
-    }
-  };
-
-  const handleRemoveEventFromProduct = () => {
-    if (selectedAsset) {
-      const email = localStorage.getItem("email");
-      const organization = email!.split("@")[1].split(".")[0];
-      deleteEventDataApi({
-        productId: selectedProduct.productId,
-        modelUuid: selectedAsset.modelUuid,
-        organization: organization,
-      });
-      removeEvent(selectedProduct.productId, selectedAsset.modelUuid);
-      clearSelectedAsset();
-    }
-  };
-
-  useEffect(() => {
-    const processes: Event[][] = [];
-    const selectedProductData = getProductById(selectedProduct.productId);
-
-    if (selectedProductData) {
-      determineExecutionMachineSequences([selectedProductData]).then(
-        (sequences) => {
-          sequences.forEach((sequence) => {
-            const events: Event[] =
-              sequence.map((event) => ({
-                modelName: event.modelName,
-                modelId: event.modelUuid,
-              })) || [];
-            processes.push(events);
-          });
-          setProcesses(processes);
+    const handleRenameProduct = (productUuid: string, newName: string) => {
+        renameProduct(productUuid, newName);
+        renameProductApi({ productName: newName, productUuid, projectId: projectId || '' });
+        if (selectedProduct.productUuid === productUuid) {
+            setSelectedProduct(productUuid, newName);
         }
-      );
-    }
-  }, [selectedProduct.productId, products]);
+    };
 
-  return (
-    <div className="simulations-container">
-      <div className="header">Simulations</div>
-      <div className="add-product-container">
-        <div className="actions section">
-          <div className="header">
-            <div className="header-value">Products</div>
-            <button
-              id="add-simulation"
-              className="add-button"
-              onClick={handleAddProduct}
-            >
-              <AddIcon /> Add
-            </button>
-          </div>
-          <div
-            className="lists-main-container"
-            ref={productsContainerRef}
-            style={{ height: "120px" }}
-          >
-            <div className="list-container">
-              {products.map((product, index) => (
-                <div
-                  key={product.productId}
-                  className={`list-item ${selectedProduct.productId === product.productId
-                    ? "active"
-                    : ""
-                    }`}
-                >
-                  {/* eslint-disable-next-line */}
-                  <div
-                    className="value"
-                    onClick={() =>
-                      setSelectedProduct(product.productId, product.productName)
-                    }
-                  >
-                    <input
-                      type="radio"
-                      name="products"
-                      checked={selectedProduct.productId === product.productId}
-                      readOnly
-                    />
-                    <RenameInput
-                      value={product.productName}
-                      onRename={(newName) =>
-                        handleRenameProduct(product.productId, newName)
-                      }
-                    />
-                  </div>
-                  {products.length > 1 && (
-                    <button
-                      id="remove-product-button"
-                      className="remove-button"
-                      onClick={() => handleRemoveProduct(product.productId)}
+    const handleRemoveEventFromProduct = () => {
+        if (selectedAsset) {
+
+            deleteEventDataApi({
+                productUuid: selectedProduct.productUuid,
+                modelUuid: selectedAsset.modelUuid,
+                projectId: projectId,
+            });
+            removeEvent(selectedProduct.productUuid, selectedAsset.modelUuid);
+            clearSelectedAsset();
+        }
+    };
+
+    useEffect(() => {
+        const processes: Event[][] = [];
+        const selectedProductData = getProductById(selectedProduct.productUuid);
+
+        if (selectedProductData) {
+            determineExecutionMachineSequences([selectedProductData]).then(
+                (sequences) => {
+                    sequences.forEach((sequence) => {
+                        const events: Event[] =
+                            sequence.map((event) => ({
+                                modelName: event.modelName,
+                                modelId: event.modelUuid,
+                            })) || [];
+                        processes.push(events);
+                    });
+                    setProcesses(processes);
+                }
+            );
+        }
+    }, [selectedProduct.productUuid, products]);
+
+    return (
+        <div className="simulations-container">
+            <div className="header">Simulations</div>
+            <div className="add-product-container">
+                <div className="actions section">
+                    <div className="header">
+                        <div className="header-value">Products</div>
+                        <button
+                            id="add-simulation"
+                            className="add-button"
+                            onClick={handleAddProduct}
+                        >
+                            <AddIcon /> Add
+                        </button>
+                    </div>
+                    <div
+                        className="lists-main-container"
+                        ref={productsContainerRef}
+                        style={{ height: "120px" }}
                     >
-                      <RemoveIcon />
-                    </button>
-                  )}
+                        <div className="list-container">
+                            {products.map((product, index) => (
+                                <div
+                                    key={product.productUuid}
+                                    className={`list-item ${selectedProduct.productUuid === product.productUuid
+                                        ? "active"
+                                        : ""
+                                        }`}
+                                >
+                                    {/* eslint-disable-next-line */}
+                                    <div
+                                        className="value"
+                                        onClick={() =>
+                                            setSelectedProduct(product.productUuid, product.productName)
+                                        }
+                                    >
+                                        <input
+                                            type="radio"
+                                            name="products"
+                                            checked={selectedProduct.productUuid === product.productUuid}
+                                            readOnly
+                                        />
+                                        <RenameInput
+                                            value={product.productName}
+                                            onRename={(newName) =>
+                                                handleRenameProduct(product.productUuid, newName)
+                                            }
+                                        />
+                                    </div>
+                                    {products.length > 1 && (
+                                        <button
+                                            id="remove-product-button"
+                                            className="remove-button"
+                                            onClick={() => handleRemoveProduct(product.productUuid)}
+                                        >
+                                            <RemoveIcon />
+                                        </button>
+                                    )}
+                                </div>
+                            ))}
+                        </div>
+                        <button
+                            className="resize-icon"
+                            id="action-resize"
+                            onMouseDown={(e: any) => handleResize(e, productsContainerRef)}
+                        >
+                            <ResizeHeightIcon />
+                        </button>
+                    </div>
+                </div>
+
+                <div className="simulation-process section">
+                    <button
+                        id="collapse-header"
+                        className="collapse-header-container"
+                        onClick={() => setOpenObjects(!openObjects)}
+                    >
+                        <div className="header">Process Flow</div>
+                        <div className="arrow-container">
+                            <ArrowIcon />
+                        </div>
+                    </button>
+                    {openObjects &&
+                        processes?.map((process, index) => (
+                            <section key={index}>
+                                {process.map((event, index) => (
+                                    <List key={`${index}-${event.modelName}`} val={event} />
+                                ))}
+                            </section>
+                        ))}
+                </div>
+
+                <div className="compare-simulations-container">
+                    <div className="compare-simulations-header">
+                        Need to Compare Layout?
+                    </div>
+                    <div className="content">
+                        Click '<span>Compare</span>' to review and analyze the layout
+                        differences between them.
+                    </div>
+                    <button className="input" onClick={() => setComparePopUp(true)}>
+                        <input type="button" value={"Compare"} className="submit" />
+                    </button>
                 </div>
-              ))}
             </div>
-            <button
-              className="resize-icon"
-              id="action-resize"
-              onMouseDown={(e: any) => handleResize(e, productsContainerRef)}
-            >
-              <ResizeHeightIcon />
-            </button>
-          </div>
+
+            {selectedAsset && (
+                <RenderOverlay>
+                    <EditWidgetOption
+                        options={["Add to Product", "Remove from Product"]}
+                        onClick={(option) => {
+                            if (option === "Add to Product") {
+                                handleAddEventToProduct({
+                                    event: getEventByModelUuid(selectedAsset.modelUuid),
+                                    addEvent,
+                                    selectedProduct,
+                                    clearSelectedAsset,
+                                    projectId: projectId || ''
+                                });
+                            } else {
+                                handleRemoveEventFromProduct();
+                            }
+                        }}
+                    />
+                </RenderOverlay>
+            )}
+
+            {comparePopUp && (
+                <RenderOverlay>
+                    <ComparePopUp onClose={handleSaveVersion} />
+                </RenderOverlay>
+            )}
         </div>
-
-        <div className="simulation-process section">
-          <button
-            id="collapse-header"
-            className="collapse-header-container"
-            onClick={() => setOpenObjects(!openObjects)}
-          >
-            <div className="header">Process Flow</div>
-            <div className="arrow-container">
-              <ArrowIcon />
-            </div>
-          </button>
-          {openObjects &&
-            processes?.map((process, index) => (
-              <section key={index}>
-                {process.map((event, index) => (
-                  <List key={`${index}-${event.modelName}`} val={event} />
-                ))}
-              </section>
-            ))}
-        </div>
-
-        <div className="compare-simulations-container">
-          <div className="compare-simulations-header">
-            Need to Compare Layout?
-          </div>
-          <div className="content">
-            Click '<span>Compare</span>' to review and analyze the layout
-            differences between them.
-          </div>
-          <button className="input" onClick={() => setComparePopUp(true)}>
-            <input type="button" value={"Compare"} className="submit" />
-          </button>
-        </div>
-      </div>
-
-      {selectedAsset && (
-        <RenderOverlay>
-          <EditWidgetOption
-            options={["Add to Product", "Remove from Product"]}
-            onClick={(option) => {
-              if (option === "Add to Product") {
-                handleAddEventToProduct({
-                  event: getEventByModelUuid(selectedAsset.modelUuid),
-                  addEvent,
-                  selectedProduct,
-                  clearSelectedAsset,
-                });
-              } else {
-                handleRemoveEventFromProduct();
-              }
-            }}
-          />
-        </RenderOverlay>
-      )}
-
-      {comparePopUp && (
-        <RenderOverlay>
-          <ComparePopUp onClose={handleSaveVersion} />
-        </RenderOverlay>
-      )}
-    </div>
-  );
+    );
 };
 
 export default Simulations;
diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/BarChartInput.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/BarChartInput.tsx
index 9ec8196..b0b328d 100644
--- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/BarChartInput.tsx
+++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/BarChartInput.tsx
@@ -56,9 +56,9 @@ const BarChartInput = (props: Props) => {
             `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/data?widgetID=${selectedChartId.id}&zoneUuid=${selectedZone.zoneUuid}&projectId=${projectId}`,
             {
               headers: {
-                Authorization: "Bearer <access_token>",  // Replace with actual token
+                Authorization: "Bearer <access_token>",
                 "Content-Type": "application/json",
-                token: localStorage.getItem("token") || "",  // Coerce null to empty string
+                token: localStorage.getItem("token") || "",
                 refresh_token: localStorage.getItem("refreshToken") || "",
               },
             }
@@ -97,9 +97,9 @@ const BarChartInput = (props: Props) => {
         `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`,
         {
           headers: {
-            Authorization: "Bearer <access_token>",  // Replace with actual token
+            Authorization: "Bearer <access_token>",
             "Content-Type": "application/json",
-            token: localStorage.getItem("token") || "",  // Coerce null to empty string
+            token: localStorage.getItem("token") || "",
             refresh_token: localStorage.getItem("refreshToken") || "",
           },
         },
diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/LineGrapInput.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/LineGrapInput.tsx
index 63cc3be..912b7d1 100644
--- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/LineGrapInput.tsx
+++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/LineGrapInput.tsx
@@ -171,9 +171,9 @@ const LineGrapInput = (props: Props) => {
             `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/data?widgetID=${selectedChartId.id}&zoneUuid=${selectedZone.zoneUuid}&projectId=${projectId}`,
             {
               headers: {
-                Authorization: "Bearer <access_token>",  // Replace with actual token
+                Authorization: "Bearer <access_token>",
                 "Content-Type": "application/json",
-                token: localStorage.getItem("token") || "",  // Coerce null to empty string
+                token: localStorage.getItem("token") || "",
                 refresh_token: localStorage.getItem("refreshToken") || "",
               },
             }
@@ -212,9 +212,9 @@ const LineGrapInput = (props: Props) => {
         `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`,
         {
           headers: {
-            Authorization: "Bearer <access_token>",  // Replace with actual token
+            Authorization: "Bearer <access_token>",
             "Content-Type": "application/json",
-            token: localStorage.getItem("token") || "",  // Coerce null to empty string
+            token: localStorage.getItem("token") || "",
             refresh_token: localStorage.getItem("refreshToken") || "",
           },
         },
diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/PieChartInput.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/PieChartInput.tsx
index 98167b7..8136c70 100644
--- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/PieChartInput.tsx
+++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/PieChartInput.tsx
@@ -56,9 +56,9 @@ const PieChartInput = (props: Props) => {
             `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/data?widgetID=${selectedChartId.id}&zoneUuid=${selectedZone.zoneUuid}&projectId=${projectId}`,
             {
               headers: {
-                Authorization: "Bearer <access_token>",  // Replace with actual token
+                Authorization: "Bearer <access_token>",
                 "Content-Type": "application/json",
-                token: localStorage.getItem("token") || "",  // Coerce null to empty string
+                token: localStorage.getItem("token") || "",
                 refresh_token: localStorage.getItem("refreshToken") || "",
               },
             }
@@ -97,9 +97,9 @@ const PieChartInput = (props: Props) => {
         `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`,
         {
           headers: {
-            Authorization: "Bearer <access_token>",  // Replace with actual token
+            Authorization: "Bearer <access_token>",
             "Content-Type": "application/json",
-            token: localStorage.getItem("token") || "",  // Coerce null to empty string
+            token: localStorage.getItem("token") || "",
             refresh_token: localStorage.getItem("refreshToken") || "",
           },
         },
diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress1Input.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress1Input.tsx
index b873e4e..8647df7 100644
--- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress1Input.tsx
+++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress1Input.tsx
@@ -56,9 +56,9 @@ const Progress1Input = (props: Props) => {
             `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/data?widgetID=${selectedChartId.id}&zoneUuid=${selectedZone.zoneUuid}&projectId=${projectId}`,
             {
               headers: {
-                Authorization: "Bearer <access_token>",  // Replace with actual token
+                Authorization: "Bearer <access_token>",
                 "Content-Type": "application/json",
-                token: localStorage.getItem("token") || "",  // Coerce null to empty string
+                token: localStorage.getItem("token") || "",
                 refresh_token: localStorage.getItem("refreshToken") || "",
               },
             }
@@ -97,9 +97,9 @@ const Progress1Input = (props: Props) => {
         `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`,
         {
           headers: {
-            Authorization: "Bearer <access_token>",  // Replace with actual token
+            Authorization: "Bearer <access_token>",
             "Content-Type": "application/json",
-            token: localStorage.getItem("token") || "",  // Coerce null to empty string
+            token: localStorage.getItem("token") || "",
             refresh_token: localStorage.getItem("refreshToken") || "",
           },
         },
diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress2Input.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress2Input.tsx
index efbdd6d..8765751 100644
--- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress2Input.tsx
+++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress2Input.tsx
@@ -56,9 +56,9 @@ const Progress2Input = (props: Props) => {
             `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/data?widgetID=${selectedChartId.id}&zoneUuid=${selectedZone.zoneUuid}&projectId=${projectId}`,
             {
               headers: {
-                Authorization: "Bearer <access_token>",  // Replace with actual token
+                Authorization: "Bearer <access_token>",
                 "Content-Type": "application/json",
-                token: localStorage.getItem("token") || "",  // Coerce null to empty string
+                token: localStorage.getItem("token") || "",
                 refresh_token: localStorage.getItem("refreshToken") || "",
               },
             }
@@ -97,9 +97,9 @@ const Progress2Input = (props: Props) => {
         `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`,
         {
           headers: {
-            Authorization: "Bearer <access_token>",  // Replace with actual token
+            Authorization: "Bearer <access_token>",
             "Content-Type": "application/json",
-            token: localStorage.getItem("token") || "",  // Coerce null to empty string
+            token: localStorage.getItem("token") || "",
             refresh_token: localStorage.getItem("refreshToken") || "",
           },
         },
diff --git a/app/src/components/templates/CollaborationPopup.tsx b/app/src/components/templates/CollaborationPopup.tsx
index ec62fb5..9e35427 100644
--- a/app/src/components/templates/CollaborationPopup.tsx
+++ b/app/src/components/templates/CollaborationPopup.tsx
@@ -140,7 +140,7 @@ const CollaborationPopup: React.FC<CollaborateProps> = ({
               <div className="users-list-container">
                 <div className="you-container">
                   <div className="your-name">
-                    <div className="user-profile">{userName[0]}</div>
+                    <div className="user-profile">{userName[0].toUpperCase()}</div>
                     {userName}
                   </div>
                   <div className="indicater">you</div>
diff --git a/app/src/components/ui/compareVersion/CompareLayOut.tsx b/app/src/components/ui/compareVersion/CompareLayOut.tsx
index 6196ca0..7cdba4b 100644
--- a/app/src/components/ui/compareVersion/CompareLayOut.tsx
+++ b/app/src/components/ui/compareVersion/CompareLayOut.tsx
@@ -111,7 +111,7 @@ const CompareLayOut = () => {
   const handleSelectLayout = (option: string) => {
     const product = products.find((product) => product.productName === option);
     if (product) {
-      setComparisonProduct(product.productId, product.productName);
+      setComparisonProduct(product.productUuid, product.productName);
       setLoadingProgress(1);
       setIsPlaying(true);
       setIsPaused(true);
@@ -162,7 +162,7 @@ const CompareLayOut = () => {
                   <div className="layouts-container">
                     {products.map((layout) => (
                       <button
-                        key={layout.productId}
+                        key={layout.productUuid}
                         className="layout-wrapper"
                         onClick={() => {
                           handleSelectLayout(layout.productName);
diff --git a/app/src/modules/builder/asset/functions/addAssetModel.ts b/app/src/modules/builder/asset/functions/addAssetModel.ts
index 79c99de..250d2bc 100644
--- a/app/src/modules/builder/asset/functions/addAssetModel.ts
+++ b/app/src/modules/builder/asset/functions/addAssetModel.ts
@@ -9,484 +9,419 @@ import * as CONSTANTS from "../../../../types/world/worldConstants";
 import PointsCalculator from "../../../simulation/events/points/functions/pointsCalculator";
 
 async function addAssetModel(
-  raycaster: THREE.Raycaster,
-  camera: THREE.Camera,
-  pointer: THREE.Vector2,
-  floorGroup: Types.RefGroup,
-  socket: Socket<any>,
-  selectedItem: any,
-  setSelectedItem: any,
-  addEvent: (event: EventsSchema) => void,
-  addAsset: (asset: Asset) => void,
-  plane: Types.RefMesh,
-  projectId?: string,
-  userId?: string
+    raycaster: THREE.Raycaster,
+    camera: THREE.Camera,
+    pointer: THREE.Vector2,
+    floorGroup: Types.RefGroup,
+    socket: Socket<any>,
+    selectedItem: any,
+    setSelectedItem: any,
+    addEvent: (event: EventsSchema) => void,
+    addAsset: (asset: Asset) => void,
+    plane: Types.RefMesh,
+    projectId?: string,
+    userId?: string
 ): Promise<void> {
-  //////////  Load Floor GLtf's and set the positions, rotation, type etc. in state and store in localstorage  //////////
+    //////////  Load Floor GLtf's and set the positions, rotation, type etc. in state and store in localstorage  //////////
 
-  let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`;
+    let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`;
 
-  try {
-    const loader = new GLTFLoader();
-    const dracoLoader = new DRACOLoader();
+    try {
+        const loader = new GLTFLoader();
+        const dracoLoader = new DRACOLoader();
 
-    dracoLoader.setDecoderPath(
-      "https://cdn.jsdelivr.net/npm/three@0.160.0/examples/jsm/libs/draco/gltf/"
-    );
-    loader.setDRACOLoader(dracoLoader);
+        dracoLoader.setDecoderPath("https://cdn.jsdelivr.net/npm/three@0.160.0/examples/jsm/libs/draco/gltf/");
+        loader.setDRACOLoader(dracoLoader);
 
-    raycaster.setFromCamera(pointer, camera);
-    const floorIntersections = raycaster.intersectObjects(
-      floorGroup.current.children,
-      true
-    );
-    const intersectedFloor = floorIntersections.find((intersect) =>
-      intersect.object.name.includes("Floor")
-    );
+        raycaster.setFromCamera(pointer, camera);
+        const floorIntersections = raycaster.intersectObjects(floorGroup.current.children, true);
+        const intersectedFloor = floorIntersections.find((intersect) => intersect.object.name.includes("Floor"));
 
-    const planeIntersections = raycaster.intersectObject(plane.current!, true);
-    const intersectedPlane = planeIntersections[0];
+        const planeIntersections = raycaster.intersectObject(plane.current!, true);
+        const intersectedPlane = planeIntersections[0];
 
-    let intersectPoint: THREE.Vector3 | null = null;
+        let intersectPoint: THREE.Vector3 | null = null;
 
-    if (intersectedFloor && intersectedPlane) {
-      intersectPoint =
-        intersectedFloor.distance < intersectedPlane.distance
-          ? new THREE.Vector3(
-            intersectedFloor.point.x,
-            Math.round(intersectedFloor.point.y),
-            intersectedFloor.point.z
-          )
-          : new THREE.Vector3(
-            intersectedPlane.point.x,
-            0,
-            intersectedPlane.point.z
-          );
-    } else if (intersectedFloor) {
-      intersectPoint = new THREE.Vector3(
-        intersectedFloor.point.x,
-        Math.round(intersectedFloor.point.y),
-        intersectedFloor.point.z
-      );
-    } else if (intersectedPlane) {
-      intersectPoint = new THREE.Vector3(
-        intersectedPlane.point.x,
-        0,
-        intersectedPlane.point.z
-      );
-    }
-
-    if (intersectPoint) {
-      if (intersectPoint.y < 0) {
-        intersectPoint = new THREE.Vector3(
-          intersectPoint.x,
-          0,
-          intersectPoint.z
-        );
-      }
-      const cachedModel = THREE.Cache.get(selectedItem.id);
-      if (cachedModel) {
-        handleModelLoad(
-          cachedModel,
-          intersectPoint!,
-          selectedItem,
-          addEvent,
-          addAsset,
-          socket,
-          projectId,
-          userId
-        );
-        return;
-      } else {
-        const cachedModelBlob = await retrieveGLTF(selectedItem.id);
-        if (cachedModelBlob) {
-          const blobUrl = URL.createObjectURL(cachedModelBlob);
-          loader.load(blobUrl, (gltf) => {
-            URL.revokeObjectURL(blobUrl);
-            THREE.Cache.remove(blobUrl);
-            THREE.Cache.add(selectedItem.id, gltf);
-            handleModelLoad(
-              gltf,
-              intersectPoint!,
-              selectedItem,
-              addEvent,
-              addAsset,
-              socket,
-              projectId,
-              userId
-            );
-          });
-        } else {
-          loader.load(
-            `${url_Backend_dwinzo}/api/v2/AssetFile/${selectedItem.id}`,
-            async (gltf) => {
-              const modelBlob = await fetch(
-                `${url_Backend_dwinzo}/api/v2/AssetFile/${selectedItem.id}`
-              ).then((res) => res.blob());
-              await storeGLTF(selectedItem.id, modelBlob);
-              THREE.Cache.add(selectedItem.id, gltf);
-              await handleModelLoad(
-                gltf,
-                intersectPoint!,
-                selectedItem,
-                addEvent,
-                addAsset,
-                socket,
-                projectId,
-                userId
-              );
-            }
-          );
+        if (intersectedFloor && intersectedPlane) {
+            intersectPoint =
+                intersectedFloor.distance < intersectedPlane.distance
+                    ? new THREE.Vector3(intersectedFloor.point.x, Math.round(intersectedFloor.point.y), intersectedFloor.point.z)
+                    : new THREE.Vector3(intersectedPlane.point.x, 0, intersectedPlane.point.z);
+        } else if (intersectedFloor) {
+            intersectPoint = new THREE.Vector3(intersectedFloor.point.x, Math.round(intersectedFloor.point.y), intersectedFloor.point.z);
+        } else if (intersectedPlane) {
+            intersectPoint = new THREE.Vector3(intersectedPlane.point.x, 0, intersectedPlane.point.z);
         }
-      }
+
+        if (intersectPoint) {
+            if (intersectPoint.y < 0) {
+                intersectPoint = new THREE.Vector3(intersectPoint.x, 0, intersectPoint.z);
+            }
+            const cachedModel = THREE.Cache.get(selectedItem.id);
+            if (cachedModel) {
+                handleModelLoad(cachedModel, intersectPoint!, selectedItem, addEvent, addAsset, socket, projectId, userId);
+                return;
+            } else {
+                const cachedModelBlob = await retrieveGLTF(selectedItem.id);
+                if (cachedModelBlob) {
+                    const blobUrl = URL.createObjectURL(cachedModelBlob);
+                    loader.load(blobUrl, (gltf) => {
+                        URL.revokeObjectURL(blobUrl);
+                        THREE.Cache.remove(blobUrl);
+                        THREE.Cache.add(selectedItem.id, gltf);
+                        handleModelLoad(gltf, intersectPoint!, selectedItem, addEvent, addAsset, socket, projectId, userId);
+                    });
+                } else {
+                    loader.load(`${url_Backend_dwinzo}/api/v2/AssetFile/${selectedItem.id}`, async (gltf) => {
+                        const modelBlob = await fetch(`${url_Backend_dwinzo}/api/v2/AssetFile/${selectedItem.id}`).then((res) => res.blob());
+                        await storeGLTF(selectedItem.id, modelBlob);
+                        THREE.Cache.add(selectedItem.id, gltf);
+                        await handleModelLoad(gltf, intersectPoint!, selectedItem, addEvent, addAsset, socket, projectId, userId);
+                    }
+                    );
+                }
+            }
+        }
+    } catch (error) {
+        echo.error("Failed to add asset");
+    } finally {
+        setSelectedItem({});
     }
-  } catch (error) {
-    echo.error("Failed to add asset");
-  } finally {
-    setSelectedItem({});
-  }
 }
 
 async function handleModelLoad(
-  gltf: any,
-  intersectPoint: THREE.Vector3,
-  selectedItem: any,
-  addEvent: (event: EventsSchema) => void,
-  addAsset: (asset: Asset) => void,
-  socket: Socket<any>,
-  projectId?: string,
-  userId?: string
+    gltf: any,
+    intersectPoint: THREE.Vector3,
+    selectedItem: any,
+    addEvent: (event: EventsSchema) => void,
+    addAsset: (asset: Asset) => void,
+    socket: Socket<any>,
+    projectId?: string,
+    userId?: string
 ) {
-  const model = gltf.scene.clone();
-  model.userData = {
-    name: selectedItem.name,
-    modelId: selectedItem.id,
-    modelUuid: model.uuid,
-  };
-  model.position.set(intersectPoint!.x, intersectPoint!.y, intersectPoint!.z);
-  model.scale.set(...CONSTANTS.assetConfig.defaultScaleAfterGsap);
-
-  model.traverse((child: any) => {
-    if (child) {
-      child.castShadow = true;
-      child.receiveShadow = true;
-    }
-  });
-
-  const newFloorItem: Asset = {
-    modelUuid: model.uuid,
-    modelName: selectedItem.name,
-    assetId: selectedItem.id,
-    position: [intersectPoint!.x, intersectPoint!.y, intersectPoint!.z],
-    rotation: [0, 0, 0],
-    isLocked: false,
-    isVisible: true,
-    isCollidable: false,
-    opacity: 1,
-  };
-
-  const email = localStorage.getItem("email");
-  const organization = email ? email.split("@")[1].split(".")[0] : "";
-
-  // API
-
-  // await setFloorItemApi(
-  //     organization,
-  //     newFloorItem.modelUuid,
-  //     newFloorItem.modelName,
-  //     newFloorItem.modelfileID,
-  //     newFloorItem.position,
-  //     { x: 0, y: 0, z: 0 },
-  //     false,
-  //     true,
-  // );
-
-  // SOCKET
-
-  if (selectedItem.type) {
-    const data = PointsCalculator(
-      selectedItem.type,
-      gltf.scene.clone(),
-      new THREE.Vector3(...model.rotation)
-    );
-
-    if (!data || !data.points) return;
-
-    const eventData: any = {
-      type: selectedItem.type,
+    const model = gltf.scene.clone();
+    model.userData = {
+        name: selectedItem.name,
+        modelId: selectedItem.id,
+        modelUuid: model.uuid,
     };
+    model.position.set(intersectPoint!.x, intersectPoint!.y, intersectPoint!.z);
+    model.scale.set(...CONSTANTS.assetConfig.defaultScaleAfterGsap);
 
-    if (selectedItem.type === "Conveyor") {
-      const ConveyorEvent: ConveyorEventSchema = {
-        modelUuid: newFloorItem.modelUuid,
-        modelName: newFloorItem.modelName,
-        position: newFloorItem.position,
-        rotation: newFloorItem.rotation,
-        state: "idle",
-        type: "transfer",
-        speed: 1,
-        points: data.points.map((point: THREE.Vector3, index: number) => {
-          const triggers: TriggerSchema[] = [];
-
-          if (data.points && index < data.points.length - 1) {
-            triggers.push({
-              triggerUuid: THREE.MathUtils.generateUUID(),
-              triggerName: `Trigger 1`,
-              triggerType: "onComplete",
-              delay: 0,
-              triggeredAsset: {
-                triggeredModel: {
-                  modelName: newFloorItem.modelName,
-                  modelUuid: newFloorItem.modelUuid,
-                },
-                triggeredPoint: {
-                  pointName: `Point`,
-                  pointUuid: "",
-                },
-                triggeredAction: {
-                  actionName: `Action 1`,
-                  actionUuid: "",
-                },
-              },
-            });
-          }
-
-          return {
-            uuid: THREE.MathUtils.generateUUID(),
-            position: [point.x, point.y, point.z],
-            rotation: [0, 0, 0],
-            action: {
-              actionUuid: THREE.MathUtils.generateUUID(),
-              actionName: `Action 1`,
-              actionType: "default",
-              material: "Default Material",
-              delay: 0,
-              spawnInterval: 5,
-              spawnCount: 1,
-              triggers: triggers,
-            },
-          };
-        }),
-      };
-
-      for (let i = 0; i < ConveyorEvent.points.length - 1; i++) {
-        const currentPoint = ConveyorEvent.points[i];
-        const nextPoint = ConveyorEvent.points[i + 1];
-
-        if (currentPoint.action.triggers.length > 0) {
-          currentPoint.action.triggers[0].triggeredAsset!.triggeredPoint!.pointUuid =
-            nextPoint.uuid;
-          currentPoint.action.triggers[0].triggeredAsset!.triggeredAction!.actionUuid =
-            nextPoint.action.actionUuid;
+    model.traverse((child: any) => {
+        if (child) {
+            child.castShadow = true;
+            child.receiveShadow = true;
         }
-      }
-      addEvent(ConveyorEvent);
-      eventData.points = ConveyorEvent.points.map((point) => ({
-        uuid: point.uuid,
-        position: point.position,
-        rotation: point.rotation,
-      }));
-    } else if (selectedItem.type === "Vehicle") {
-      const vehicleEvent: VehicleEventSchema = {
-        modelUuid: newFloorItem.modelUuid,
-        modelName: newFloorItem.modelName,
-        position: newFloorItem.position,
-        rotation: newFloorItem.rotation,
-        state: "idle",
-        type: "vehicle",
-        speed: 1,
-        point: {
-          uuid: THREE.MathUtils.generateUUID(),
-          position: [data.points[0].x, data.points[0].y, data.points[0].z],
-          rotation: [0, 0, 0],
-          action: {
-            actionUuid: THREE.MathUtils.generateUUID(),
-            actionName: "Action 1",
-            actionType: "travel",
-            unLoadDuration: 5,
-            loadCapacity: 1,
-            steeringAngle: 0,
-            pickUpPoint: null,
-            unLoadPoint: null,
-            triggers: [],
-          },
-        },
-      };
-      addEvent(vehicleEvent);
-      eventData.point = {
-        uuid: vehicleEvent.point.uuid,
-        position: vehicleEvent.point.position,
-        rotation: vehicleEvent.point.rotation,
-      };
-    } else if (selectedItem.type === "ArmBot") {
-      const roboticArmEvent: RoboticArmEventSchema = {
-        modelUuid: newFloorItem.modelUuid,
-        modelName: newFloorItem.modelName,
-        position: newFloorItem.position,
-        rotation: newFloorItem.rotation,
-        state: "idle",
-        type: "roboticArm",
-        speed: 1,
-        point: {
-          uuid: THREE.MathUtils.generateUUID(),
-          position: [data.points[0].x, data.points[0].y, data.points[0].z],
-          rotation: [0, 0, 0],
-          actions: [
-            {
-              actionUuid: THREE.MathUtils.generateUUID(),
-              actionName: "Action 1",
-              actionType: "pickAndPlace",
-              process: {
-                startPoint: null,
-                endPoint: null,
-              },
-              triggers: [],
+    });
+
+    const newFloorItem: Asset = {
+        modelUuid: model.uuid,
+        modelName: selectedItem.name,
+        assetId: selectedItem.id,
+        position: [intersectPoint!.x, intersectPoint!.y, intersectPoint!.z],
+        rotation: [0, 0, 0],
+        isLocked: false,
+        isVisible: true,
+        isCollidable: false,
+        opacity: 1,
+    };
+
+    const email = localStorage.getItem("email");
+    const organization = email ? email.split("@")[1].split(".")[0] : "";
+
+    // API
+
+    // await setFloorItemApi(
+    //     organization,
+    //     newFloorItem.modelUuid,
+    //     newFloorItem.modelName,
+    //     newFloorItem.modelfileID,
+    //     newFloorItem.position,
+    //     { x: 0, y: 0, z: 0 },
+    //     false,
+    //     true,
+    // );
+
+    // SOCKET
+
+    if (selectedItem.type) {
+        const data = PointsCalculator(
+            selectedItem.type,
+            gltf.scene.clone(),
+            new THREE.Vector3(...model.rotation)
+        );
+
+        if (!data || !data.points) return;
+
+        const eventData: any = {
+            type: selectedItem.type,
+        };
+
+        if (selectedItem.type === "Conveyor") {
+            const ConveyorEvent: ConveyorEventSchema = {
+                modelUuid: newFloorItem.modelUuid,
+                modelName: newFloorItem.modelName,
+                position: newFloorItem.position,
+                rotation: newFloorItem.rotation,
+                state: "idle",
+                type: "transfer",
+                speed: 1,
+                points: data.points.map((point: THREE.Vector3, index: number) => {
+                    const triggers: TriggerSchema[] = [];
+
+                    if (data.points && index < data.points.length - 1) {
+                        triggers.push({
+                            triggerUuid: THREE.MathUtils.generateUUID(),
+                            triggerName: `Trigger 1`,
+                            triggerType: "onComplete",
+                            delay: 0,
+                            triggeredAsset: {
+                                triggeredModel: {
+                                    modelName: newFloorItem.modelName,
+                                    modelUuid: newFloorItem.modelUuid,
+                                },
+                                triggeredPoint: {
+                                    pointName: `Point`,
+                                    pointUuid: "",
+                                },
+                                triggeredAction: {
+                                    actionName: `Action 1`,
+                                    actionUuid: "",
+                                },
+                            },
+                        });
+                    }
+
+                    return {
+                        uuid: THREE.MathUtils.generateUUID(),
+                        position: [point.x, point.y, point.z],
+                        rotation: [0, 0, 0],
+                        action: {
+                            actionUuid: THREE.MathUtils.generateUUID(),
+                            actionName: `Action 1`,
+                            actionType: "default",
+                            material: "Default Material",
+                            delay: 0,
+                            spawnInterval: 5,
+                            spawnCount: 1,
+                            triggers: triggers,
+                        },
+                    };
+                }),
+            };
+
+            for (let i = 0; i < ConveyorEvent.points.length - 1; i++) {
+                const currentPoint = ConveyorEvent.points[i];
+                const nextPoint = ConveyorEvent.points[i + 1];
+
+                if (currentPoint.action.triggers.length > 0) {
+                    currentPoint.action.triggers[0].triggeredAsset!.triggeredPoint!.pointUuid = nextPoint.uuid;
+                    currentPoint.action.triggers[0].triggeredAsset!.triggeredAction!.actionUuid = nextPoint.action.actionUuid;
+                }
+            }
+            addEvent(ConveyorEvent);
+            eventData.points = ConveyorEvent.points.map((point) => ({
+                uuid: point.uuid,
+                position: point.position,
+                rotation: point.rotation,
+            }));
+        } else if (selectedItem.type === "Vehicle") {
+            const vehicleEvent: VehicleEventSchema = {
+                modelUuid: newFloorItem.modelUuid,
+                modelName: newFloorItem.modelName,
+                position: newFloorItem.position,
+                rotation: newFloorItem.rotation,
+                state: "idle",
+                type: "vehicle",
+                speed: 1,
+                point: {
+                    uuid: THREE.MathUtils.generateUUID(),
+                    position: [data.points[0].x, data.points[0].y, data.points[0].z],
+                    rotation: [0, 0, 0],
+                    action: {
+                        actionUuid: THREE.MathUtils.generateUUID(),
+                        actionName: "Action 1",
+                        actionType: "travel",
+                        unLoadDuration: 5,
+                        loadCapacity: 1,
+                        steeringAngle: 0,
+                        pickUpPoint: null,
+                        unLoadPoint: null,
+                        triggers: [],
+                    },
+                },
+            };
+            addEvent(vehicleEvent);
+            eventData.point = {
+                uuid: vehicleEvent.point.uuid,
+                position: vehicleEvent.point.position,
+                rotation: vehicleEvent.point.rotation,
+            };
+        } else if (selectedItem.type === "ArmBot") {
+            const roboticArmEvent: RoboticArmEventSchema = {
+                modelUuid: newFloorItem.modelUuid,
+                modelName: newFloorItem.modelName,
+                position: newFloorItem.position,
+                rotation: newFloorItem.rotation,
+                state: "idle",
+                type: "roboticArm",
+                speed: 1,
+                point: {
+                    uuid: THREE.MathUtils.generateUUID(),
+                    position: [data.points[0].x, data.points[0].y, data.points[0].z],
+                    rotation: [0, 0, 0],
+                    actions: [
+                        {
+                            actionUuid: THREE.MathUtils.generateUUID(),
+                            actionName: "Action 1",
+                            actionType: "pickAndPlace",
+                            process: {
+                                startPoint: null,
+                                endPoint: null,
+                            },
+                            triggers: [],
+                        },
+                    ],
+                },
+            };
+            addEvent(roboticArmEvent);
+            eventData.point = {
+                uuid: roboticArmEvent.point.uuid,
+                position: roboticArmEvent.point.position,
+                rotation: roboticArmEvent.point.rotation,
+            };
+        } else if (selectedItem.type === "StaticMachine") {
+            const machineEvent: MachineEventSchema = {
+                modelUuid: newFloorItem.modelUuid,
+                modelName: newFloorItem.modelName,
+                position: newFloorItem.position,
+                rotation: newFloorItem.rotation,
+                state: "idle",
+                type: "machine",
+                point: {
+                    uuid: THREE.MathUtils.generateUUID(),
+                    position: [data.points[0].x, data.points[0].y, data.points[0].z],
+                    rotation: [0, 0, 0],
+                    action: {
+                        actionUuid: THREE.MathUtils.generateUUID(),
+                        actionName: "Action 1",
+                        actionType: "process",
+                        processTime: 10,
+                        swapMaterial: "Default Material",
+                        triggers: [],
+                    },
+                },
+            };
+            addEvent(machineEvent);
+            eventData.point = {
+                uuid: machineEvent.point.uuid,
+                position: machineEvent.point.position,
+                rotation: machineEvent.point.rotation,
+            };
+        } else if (selectedItem.type === "Storage") {
+            const storageEvent: StorageEventSchema = {
+                modelUuid: newFloorItem.modelUuid,
+                modelName: newFloorItem.modelName,
+                position: newFloorItem.position,
+                rotation: newFloorItem.rotation,
+                state: "idle",
+                type: "storageUnit",
+                point: {
+                    uuid: THREE.MathUtils.generateUUID(),
+                    position: [data.points[0].x, data.points[0].y, data.points[0].z],
+                    rotation: [0, 0, 0],
+                    action: {
+                        actionUuid: THREE.MathUtils.generateUUID(),
+                        actionName: "Action 1",
+                        actionType: "store",
+                        storageCapacity: 10,
+                        triggers: [],
+                    },
+                },
+            };
+            addEvent(storageEvent);
+            eventData.point = {
+                uuid: storageEvent.point.uuid,
+                position: storageEvent.point.position,
+                rotation: storageEvent.point.rotation,
+            };
+        }
+
+        const completeData = {
+            organization,
+            modelUuid: newFloorItem.modelUuid,
+            modelName: newFloorItem.modelName,
+            modelfileID: newFloorItem.assetId,
+            position: newFloorItem.position,
+            rotation: {
+                x: model.rotation.x,
+                y: model.rotation.y,
+                z: model.rotation.z,
             },
-          ],
-        },
-      };
-      addEvent(roboticArmEvent);
-      eventData.point = {
-        uuid: roboticArmEvent.point.uuid,
-        position: roboticArmEvent.point.position,
-        rotation: roboticArmEvent.point.rotation,
-      };
-    } else if (selectedItem.type === "StaticMachine") {
-      const machineEvent: MachineEventSchema = {
-        modelUuid: newFloorItem.modelUuid,
-        modelName: newFloorItem.modelName,
-        position: newFloorItem.position,
-        rotation: newFloorItem.rotation,
-        state: "idle",
-        type: "machine",
-        point: {
-          uuid: THREE.MathUtils.generateUUID(),
-          position: [data.points[0].x, data.points[0].y, data.points[0].z],
-          rotation: [0, 0, 0],
-          action: {
-            actionUuid: THREE.MathUtils.generateUUID(),
-            actionName: "Action 1",
-            actionType: "process",
-            processTime: 10,
-            swapMaterial: "Default Material",
-            triggers: [],
-          },
-        },
-      };
-      addEvent(machineEvent);
-      eventData.point = {
-        uuid: machineEvent.point.uuid,
-        position: machineEvent.point.position,
-        rotation: machineEvent.point.rotation,
-      };
-    } else if (selectedItem.type === "Storage") {
-      const storageEvent: StorageEventSchema = {
-        modelUuid: newFloorItem.modelUuid,
-        modelName: newFloorItem.modelName,
-        position: newFloorItem.position,
-        rotation: newFloorItem.rotation,
-        state: "idle",
-        type: "storageUnit",
-        point: {
-          uuid: THREE.MathUtils.generateUUID(),
-          position: [data.points[0].x, data.points[0].y, data.points[0].z],
-          rotation: [0, 0, 0],
-          action: {
-            actionUuid: THREE.MathUtils.generateUUID(),
-            actionName: "Action 1",
-            actionType: "store",
-            storageCapacity: 10,
-            triggers: [],
-          },
-        },
-      };
-      addEvent(storageEvent);
-      eventData.point = {
-        uuid: storageEvent.point.uuid,
-        position: storageEvent.point.position,
-        rotation: storageEvent.point.rotation,
-      };
+            isLocked: false,
+            isVisible: true,
+            socketId: socket.id,
+            eventData: eventData,
+            projectId: projectId,
+            userId: userId,
+        };
+
+        socket.emit("v1:model-asset:add", completeData);
+
+        const asset: Asset = {
+            modelUuid: completeData.modelUuid,
+            modelName: completeData.modelName,
+            assetId: completeData.modelfileID,
+            position: completeData.position,
+            rotation: [
+                completeData.rotation.x,
+                completeData.rotation.y,
+                completeData.rotation.z,
+            ] as [number, number, number],
+            isLocked: completeData.isLocked,
+            isCollidable: false,
+            isVisible: completeData.isVisible,
+            opacity: 1,
+            eventData: completeData.eventData,
+        };
+
+        addAsset(asset);
+    } else {
+        const data = {
+            organization,
+            modelUuid: newFloorItem.modelUuid,
+            modelName: newFloorItem.modelName,
+            modelfileID: newFloorItem.assetId,
+            position: newFloorItem.position,
+            rotation: {
+                x: model.rotation.x,
+                y: model.rotation.y,
+                z: model.rotation.z,
+            },
+            isLocked: false,
+            isVisible: true,
+            socketId: socket.id,
+            projectId: projectId,
+            userId: userId,
+        };
+
+        socket.emit("v1:model-asset:add", data);
+
+        const asset = {
+            modelUuid: data.modelUuid,
+            modelName: data.modelName,
+            assetId: data.modelfileID,
+            position: data.position,
+            rotation: [data.rotation.x, data.rotation.y, data.rotation.z] as [number, number, number],
+            isLocked: data.isLocked,
+            isCollidable: false,
+            isVisible: data.isVisible,
+            opacity: 1,
+        };
+
+        addAsset(asset);
     }
-
-    const completeData = {
-      organization,
-      modelUuid: newFloorItem.modelUuid,
-      modelName: newFloorItem.modelName,
-      modelfileID: newFloorItem.assetId,
-      position: newFloorItem.position,
-      rotation: {
-        x: model.rotation.x,
-        y: model.rotation.y,
-        z: model.rotation.z,
-      },
-      isLocked: false,
-      isVisible: true,
-      socketId: socket.id,
-      eventData: eventData,
-      projectId: projectId,
-      userId: userId,
-    };
-
-    console.log("completeData: ", completeData);
-    socket.emit("v1:model-asset:add", completeData);
-
-    const asset: Asset = {
-      modelUuid: completeData.modelUuid,
-      modelName: completeData.modelName,
-      assetId: completeData.modelfileID,
-      position: completeData.position,
-      rotation: [
-        completeData.rotation.x,
-        completeData.rotation.y,
-        completeData.rotation.z,
-      ] as [number, number, number],
-      isLocked: completeData.isLocked,
-      isCollidable: false,
-      isVisible: completeData.isVisible,
-      opacity: 1,
-      eventData: completeData.eventData,
-    };
-
-    addAsset(asset);
-  } else {
-    const data = {
-      organization,
-      modelUuid: newFloorItem.modelUuid,
-      modelName: newFloorItem.modelName,
-      modelfileID: newFloorItem.assetId,
-      position: newFloorItem.position,
-      rotation: {
-        x: model.rotation.x,
-        y: model.rotation.y,
-        z: model.rotation.z,
-      },
-      isLocked: false,
-      isVisible: true,
-      socketId: socket.id,
-      projectId: projectId,
-      userId: userId,
-    };
-
-    socket.emit("v1:model-asset:add", data);
-
-    const asset = {
-      modelUuid: data.modelUuid,
-      modelName: data.modelName,
-      assetId: data.modelfileID,
-      position: data.position,
-      rotation: [data.rotation.x, data.rotation.y, data.rotation.z] as [
-        number,
-        number,
-        number
-      ],
-      isLocked: data.isLocked,
-      isCollidable: false,
-      isVisible: data.isVisible,
-      opacity: 1,
-    };
-
-    addAsset(asset);
-  }
 }
 
 export default addAssetModel;
diff --git a/app/src/modules/builder/asset/models/model/model.tsx b/app/src/modules/builder/asset/models/model/model.tsx
index ae65d0b..f70176b 100644
--- a/app/src/modules/builder/asset/models/model/model.tsx
+++ b/app/src/modules/builder/asset/models/model/model.tsx
@@ -211,7 +211,7 @@ function Model({ asset }: { readonly asset: Asset }) {
         if (activeTool === "cursor" && subModule === 'simulations') {
             if (asset.modelUuid) {
                 const canvasElement = gl.domElement;
-                const isInProduct = getIsEventInProduct(selectedProduct.productId, asset.modelUuid);
+                const isInProduct = getIsEventInProduct(selectedProduct.productUuid, asset.modelUuid);
                 if (isInProduct) {
                     const event = getEventByModelUuid(asset.modelUuid);
                     if (event) {
diff --git a/app/src/modules/scene/controls/selectionControls/moveControls.tsx b/app/src/modules/scene/controls/selectionControls/moveControls.tsx
index 45dcf25..7a244f4 100644
--- a/app/src/modules/scene/controls/selectionControls/moveControls.tsx
+++ b/app/src/modules/scene/controls/selectionControls/moveControls.tsx
@@ -1,11 +1,7 @@
 import * as THREE from "three";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useFrame, useThree } from "@react-three/fiber";
-import {
-    useSelectedAssets,
-    useSocketStore,
-    useToggleView,
-} from "../../../../store/builder/store";
+import { useSelectedAssets, useSocketStore, useToggleView, } from "../../../../store/builder/store";
 // import { setFloorItemApi } from '../../../../services/factoryBuilder/assest/floorAsset/setFloorItemApi';
 import * as Types from "../../../../types/world/worldTypes";
 import { detectModifierKeys } from "../../../../utils/shortcutkeys/detectModifierKeys";
@@ -48,14 +44,14 @@ function MoveControls({
 
     const updateBackend = (
         productName: string,
-        productId: string,
-        organization: string,
+        productUuid: string,
+        projectId: string,
         eventData: EventsSchema
     ) => {
         upsertProductOrEventApi({
             productName: productName,
-            productId: productId,
-            organization: organization,
+            productUuid: productUuid,
+            projectId: projectId,
             eventDatas: eventData,
         });
     };
@@ -250,7 +246,7 @@ function MoveControls({
 
                 if (obj.userData.eventData) {
                     const eventData = useEventsStore.getState().getEventByModelUuid(obj.userData.modelUuid);
-                    const productData = useProductStore.getState().getEventByModelUuid(selectedProduct.productId, obj.userData.modelUuid);
+                    const productData = useProductStore.getState().getEventByModelUuid(selectedProduct.productUuid, obj.userData.modelUuid);
 
                     if (eventData) {
                         useEventsStore.getState().updateEvent(obj.userData.modelUuid, {
@@ -263,7 +259,7 @@ function MoveControls({
                         const event = useProductStore
                             .getState()
                             .updateEvent(
-                                selectedProduct.productId,
+                                selectedProduct.productUuid,
                                 obj.userData.modelUuid,
                                 {
                                     position: [worldPosition.x, worldPosition.y, worldPosition.z],
@@ -274,8 +270,8 @@ function MoveControls({
                         if (event) {
                             updateBackend(
                                 selectedProduct.productName,
-                                selectedProduct.productId,
-                                organization,
+                                selectedProduct.productUuid,
+                                projectId || '',
                                 event
                             );
                         }
diff --git a/app/src/modules/scene/controls/selectionControls/rotateControls.tsx b/app/src/modules/scene/controls/selectionControls/rotateControls.tsx
index cd68dd3..0b42a0e 100644
--- a/app/src/modules/scene/controls/selectionControls/rotateControls.tsx
+++ b/app/src/modules/scene/controls/selectionControls/rotateControls.tsx
@@ -41,14 +41,14 @@ function RotateControls({
 
     const updateBackend = (
         productName: string,
-        productId: string,
-        organization: string,
+        productUuid: string,
+        projectId: string,
         eventData: EventsSchema
     ) => {
         upsertProductOrEventApi({
             productName: productName,
-            productId: productId,
-            organization: organization,
+            productUuid: productUuid,
+            projectId: projectId,
             eventDatas: eventData
         })
     }
@@ -212,7 +212,7 @@ function RotateControls({
 
                 if (obj.userData.eventData) {
                     const eventData = useEventsStore.getState().getEventByModelUuid(obj.userData.modelUuid);
-                    const productData = useProductStore.getState().getEventByModelUuid(selectedProductStore.getState().selectedProduct.productId, obj.userData.modelUuid);
+                    const productData = useProductStore.getState().getEventByModelUuid(selectedProductStore.getState().selectedProduct.productUuid, obj.userData.modelUuid);
 
                     if (eventData) {
                         useEventsStore.getState().updateEvent(obj.userData.modelUuid, {
@@ -221,7 +221,7 @@ function RotateControls({
                         })
                     }
                     if (productData) {
-                        const event = useProductStore.getState().updateEvent(selectedProductStore.getState().selectedProduct.productId, obj.userData.modelUuid, {
+                        const event = useProductStore.getState().updateEvent(selectedProductStore.getState().selectedProduct.productUuid, obj.userData.modelUuid, {
                             position: [worldPosition.x, worldPosition.y, worldPosition.z],
                             rotation: [obj.rotation.x, obj.rotation.y, obj.rotation.z],
                         })
@@ -229,8 +229,8 @@ function RotateControls({
                         if (event && organization) {
                             updateBackend(
                                 selectedProduct.productName,
-                                selectedProduct.productId,
-                                organization,
+                                selectedProduct.productUuid,
+                                projectId || '',
                                 event
                             );
                         }
diff --git a/app/src/modules/scene/controls/selectionControls/selectionControls.tsx b/app/src/modules/scene/controls/selectionControls/selectionControls.tsx
index 5ee60b1..6a6bc50 100644
--- a/app/src/modules/scene/controls/selectionControls/selectionControls.tsx
+++ b/app/src/modules/scene/controls/selectionControls/selectionControls.tsx
@@ -276,7 +276,8 @@ const SelectionControls: React.FC = () => {
                     modelUuid: selectedMesh.userData.modelUuid,
                     modelName: selectedMesh.userData.modelName,
                     socketId: socket.id,
-                    projectId,userId
+                    projectId,
+                    userId
                 };
 
                 socket.emit("v1:model-asset:delete", data);
diff --git a/app/src/modules/scene/controls/transformControls/transformControls.tsx b/app/src/modules/scene/controls/transformControls/transformControls.tsx
index aca0629..86a29c8 100644
--- a/app/src/modules/scene/controls/transformControls/transformControls.tsx
+++ b/app/src/modules/scene/controls/transformControls/transformControls.tsx
@@ -3,7 +3,6 @@ import * as THREE from "three";
 import { useSelectedFloorItem, useObjectPosition, useObjectRotation, useActiveTool, useSocketStore } from "../../../../store/builder/store";
 import { useThree } from "@react-three/fiber";
 
-import * as Types from '../../../../types/world/worldTypes';
 import { useEffect, useState } from "react";
 import { detectModifierKeys } from "../../../../utils/shortcutkeys/detectModifierKeys";
 import { useEventsStore } from "../../../../store/simulation/useEventsStore";
@@ -33,14 +32,14 @@ export default function TransformControl() {
 
     const updateBackend = (
         productName: string,
-        productId: string,
-        organization: string,
+        productUuid: string,
+        projectId: string,
         eventData: EventsSchema
     ) => {
         upsertProductOrEventApi({
             productName: productName,
-            productId: productId,
-            organization: organization,
+            productUuid: productUuid,
+            projectId: projectId,
             eventDatas: eventData,
         });
     };
@@ -69,7 +68,7 @@ export default function TransformControl() {
         if (asset) {
             if (asset.eventData) {
                 const eventData = useEventsStore.getState().getEventByModelUuid(asset.modelUuid);
-                const productData = useProductStore.getState().getEventByModelUuid(selectedProduct.productId, asset.modelUuid);
+                const productData = useProductStore.getState().getEventByModelUuid(selectedProduct.productUuid, asset.modelUuid);
 
                 if (eventData) {
                     useEventsStore.getState().updateEvent(asset.modelUuid, {
@@ -82,7 +81,7 @@ export default function TransformControl() {
                     const event = useProductStore
                         .getState()
                         .updateEvent(
-                            selectedProduct.productId,
+                            selectedProduct.productUuid,
                             asset.modelUuid,
                             {
                                 position: [selectedFloorItem.position.x, 0, selectedFloorItem.position.z] as [number, number, number],
@@ -93,8 +92,8 @@ export default function TransformControl() {
                     if (event) {
                         updateBackend(
                             selectedProduct.productName,
-                            selectedProduct.productId,
-                            organization,
+                            selectedProduct.productUuid,
+                            projectId || '',
                             event
                         );
                     }
diff --git a/app/src/modules/simulation/actions/conveyor/actionHandler/useSpawnHandler.ts b/app/src/modules/simulation/actions/conveyor/actionHandler/useSpawnHandler.ts
index d546b12..6e1cfee 100644
--- a/app/src/modules/simulation/actions/conveyor/actionHandler/useSpawnHandler.ts
+++ b/app/src/modules/simulation/actions/conveyor/actionHandler/useSpawnHandler.ts
@@ -36,13 +36,13 @@ export function useSpawnHandler() {
     const [activeSpawns, setActiveSpawns] = useState<Map<string, SpawnInstance>>(new Map());
 
     const getConveyorPausedState = useCallback((action: ConveyorAction) => {
-        const modelUuid = getModelUuidByActionUuid(selectedProduct.productId, action.actionUuid);
+        const modelUuid = getModelUuidByActionUuid(selectedProduct.productUuid, action.actionUuid);
         if (!modelUuid) return false;
 
         const conveyor = getConveyorById(modelUuid);
         if (!conveyor) return false;
         return conveyor.isPaused;
-    }, [getConveyorById, getModelUuidByActionUuid, selectedProduct.productId]);
+    }, [getConveyorById, getModelUuidByActionUuid, selectedProduct.productUuid]);
 
     const shouldPauseSpawn = useCallback((action: ConveyorAction) => {
         return isPaused || getConveyorPausedState(action);
@@ -63,8 +63,8 @@ export function useSpawnHandler() {
     }
 
     const createNewMaterial = useCallback((materialType: string, action: ConveyorAction) => {
-        const modelUuid = getModelUuidByActionUuid(selectedProduct.productId, action.actionUuid);
-        const pointUuid = getPointUuidByActionUuid(selectedProduct.productId, action.actionUuid);
+        const modelUuid = getModelUuidByActionUuid(selectedProduct.productUuid, action.actionUuid);
+        const pointUuid = getPointUuidByActionUuid(selectedProduct.productUuid, action.actionUuid);
         if (!modelUuid || !pointUuid) return;
         const currentTime = performance.now();
 
@@ -96,7 +96,7 @@ export function useSpawnHandler() {
 
         addMaterial(newMaterial);
         return newMaterial;
-    }, [addMaterial, getModelUuidByActionUuid, getPointUuidByActionUuid, selectedProduct.productId]);
+    }, [addMaterial, getModelUuidByActionUuid, getPointUuidByActionUuid, selectedProduct.productUuid]);
 
     useFrame(() => {
         const currentTime = performance.now();
diff --git a/app/src/modules/simulation/actions/machine/actionHandler/useProcessHandler.ts b/app/src/modules/simulation/actions/machine/actionHandler/useProcessHandler.ts
index 378975a..f9c9733 100644
--- a/app/src/modules/simulation/actions/machine/actionHandler/useProcessHandler.ts
+++ b/app/src/modules/simulation/actions/machine/actionHandler/useProcessHandler.ts
@@ -23,7 +23,7 @@ export function useProcessHandler() {
         const material = getMaterialById(materialId);
         if (!material) return;
 
-        const modelUuid = getModelUuidByActionUuid(selectedProduct.productId, action.actionUuid);
+        const modelUuid = getModelUuidByActionUuid(selectedProduct.productUuid, action.actionUuid);
 
         if (!modelUuid) return;
         setMaterial(material.materialId, newMaterialType);
diff --git a/app/src/modules/simulation/actions/roboticArm/actionHandler/usePickAndPlaceHandler.ts b/app/src/modules/simulation/actions/roboticArm/actionHandler/usePickAndPlaceHandler.ts
index cfa62f9..a85a775 100644
--- a/app/src/modules/simulation/actions/roboticArm/actionHandler/usePickAndPlaceHandler.ts
+++ b/app/src/modules/simulation/actions/roboticArm/actionHandler/usePickAndPlaceHandler.ts
@@ -21,7 +21,7 @@ export function usePickAndPlaceHandler() {
         const material = getMaterialById(materialId);
         if (!material) return;
 
-        const modelUuid = getModelUuidByActionUuid(selectedProduct.productId, action.actionUuid);
+        const modelUuid = getModelUuidByActionUuid(selectedProduct.productUuid, action.actionUuid);
 
         if (!modelUuid) return;
 
@@ -34,7 +34,7 @@ export function usePickAndPlaceHandler() {
 
         pickAndPlaceLogStatus(material.materialName, `is going to be picked by armBot ${modelUuid}`);
 
-    }, [getMaterialById, getModelUuidByActionUuid, selectedProduct.productId, addCurrentAction]);
+    }, [getMaterialById, getModelUuidByActionUuid, selectedProduct.productUuid, addCurrentAction]);
 
     return {
         handlePickAndPlace,
diff --git a/app/src/modules/simulation/actions/storageUnit/actionHandler/useRetrieveHandler.ts b/app/src/modules/simulation/actions/storageUnit/actionHandler/useRetrieveHandler.ts
index 5d4ea93..769aad8 100644
--- a/app/src/modules/simulation/actions/storageUnit/actionHandler/useRetrieveHandler.ts
+++ b/app/src/modules/simulation/actions/storageUnit/actionHandler/useRetrieveHandler.ts
@@ -30,8 +30,8 @@ export function useRetrieveHandler() {
     }
 
     const createNewMaterial = useCallback((materialId: string, materialType: string, action: StorageAction) => {
-        const modelUuid = getModelUuidByActionUuid(selectedProduct.productId, action.actionUuid);
-        const pointUuid = getPointUuidByActionUuid(selectedProduct.productId, action.actionUuid);
+        const modelUuid = getModelUuidByActionUuid(selectedProduct.productUuid, action.actionUuid);
+        const pointUuid = getPointUuidByActionUuid(selectedProduct.productUuid, action.actionUuid);
         if (!modelUuid || !pointUuid) return null;
         const currentTime = performance.now();
 
@@ -64,7 +64,7 @@ export function useRetrieveHandler() {
             return newMaterial;
         }
         return null;
-    }, [addMaterial, getModelUuidByActionUuid, getPointUuidByActionUuid, selectedProduct.productId]);
+    }, [addMaterial, getModelUuidByActionUuid, getPointUuidByActionUuid, selectedProduct.productUuid]);
 
     useEffect(() => {
         if (isPlaying && !initialDelayComplete) {
@@ -100,7 +100,7 @@ export function useRetrieveHandler() {
             if (retrieval.isProcessing) return;
 
             const storageUnit = getStorageUnitById(
-                getModelUuidByActionUuid(selectedProduct.productId, retrieval.action.actionUuid) ?? ''
+                getModelUuidByActionUuid(selectedProduct.productUuid, retrieval.action.actionUuid) ?? ''
             );
 
             if (!storageUnit || storageUnit.currentLoad <= 0) {
@@ -114,7 +114,7 @@ export function useRetrieveHandler() {
             }
 
             const triggeredModel = getEventByModelUuid(
-                selectedProduct.productId,
+                selectedProduct.productUuid,
                 retrieval.action.triggers[0]?.triggeredAsset.triggeredModel.modelUuid
             );
 
@@ -160,9 +160,9 @@ export function useRetrieveHandler() {
                     if (lastMaterial) {
 
                         if (retrieval.action.triggers[0]?.triggeredAsset.triggeredAction?.actionUuid) {
-                            const action = getActionByUuid(selectedProduct.productId, retrieval.action.triggers[0]?.triggeredAsset.triggeredAction.actionUuid);
+                            const action = getActionByUuid(selectedProduct.productUuid, retrieval.action.triggers[0]?.triggeredAsset.triggeredAction.actionUuid);
                             if (action && action.triggers.length > 0 && action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid) {
-                                const model = getEventByModelUuid(selectedProduct.productId, action.triggers[0]?.triggeredAsset.triggeredModel.modelUuid);
+                                const model = getEventByModelUuid(selectedProduct.productUuid, action.triggers[0]?.triggeredAsset.triggeredModel.modelUuid);
                                 if (model) {
                                     if (model.type === 'vehicle') {
                                         const vehicle = getVehicleById(model.modelUuid);
diff --git a/app/src/modules/simulation/actions/storageUnit/actionHandler/useStoreHandler.ts b/app/src/modules/simulation/actions/storageUnit/actionHandler/useStoreHandler.ts
index 2656457..f52d4a7 100644
--- a/app/src/modules/simulation/actions/storageUnit/actionHandler/useStoreHandler.ts
+++ b/app/src/modules/simulation/actions/storageUnit/actionHandler/useStoreHandler.ts
@@ -21,7 +21,7 @@ export function useStoreHandler() {
         const material = getMaterialById(materialId);
         if (!material) return;
 
-        const modelUuid = getModelUuidByActionUuid(selectedProduct.productId, action.actionUuid);
+        const modelUuid = getModelUuidByActionUuid(selectedProduct.productUuid, action.actionUuid);
         if (!modelUuid) return;
 
         setEndTime(material.materialId, performance.now());
diff --git a/app/src/modules/simulation/actions/vehicle/actionHandler/useTravelHandler.ts b/app/src/modules/simulation/actions/vehicle/actionHandler/useTravelHandler.ts
index fe3dd4a..944c420 100644
--- a/app/src/modules/simulation/actions/vehicle/actionHandler/useTravelHandler.ts
+++ b/app/src/modules/simulation/actions/vehicle/actionHandler/useTravelHandler.ts
@@ -21,7 +21,7 @@ export function useTravelHandler() {
         const material = getMaterialById(materialId);
         if (!material) return;
 
-        const modelUuid = getModelUuidByActionUuid(selectedProduct.productId, action.actionUuid);
+        const modelUuid = getModelUuidByActionUuid(selectedProduct.productUuid, action.actionUuid);
 
         if (!modelUuid) return;
 
@@ -30,7 +30,7 @@ export function useTravelHandler() {
 
         travelLogStatus(material.materialName, `is triggering travel from ${modelUuid}`);
 
-    }, [addCurrentMaterial, getMaterialById, getModelUuidByActionUuid, incrementVehicleLoad, selectedProduct.productId]);
+    }, [addCurrentMaterial, getMaterialById, getModelUuidByActionUuid, incrementVehicleLoad, selectedProduct.productUuid]);
 
     return {
         handleTravel,
diff --git a/app/src/modules/simulation/analysis/throughPut/throughPutData.tsx b/app/src/modules/simulation/analysis/throughPut/throughPutData.tsx
index 6b9062f..aa7fc19 100644
--- a/app/src/modules/simulation/analysis/throughPut/throughPutData.tsx
+++ b/app/src/modules/simulation/analysis/throughPut/throughPutData.tsx
@@ -40,7 +40,7 @@ export default function ThroughPutData() {
         } else {
             let process: any = [];
             const fetchProductSequenceData = async () => {
-                const productData = getProductById(selectedProduct.productId);
+                const productData = getProductById(selectedProduct.productUuid);
                 if (productData) {
                     const productSequenceData = await determineExecutionMachineSequences([productData])
                     if (productSequenceData?.length > 0) {
diff --git a/app/src/modules/simulation/conveyor/instances/conveyorInstance/conveyorInstance.tsx b/app/src/modules/simulation/conveyor/instances/conveyorInstance/conveyorInstance.tsx
index 67db5b9..5bd4133 100644
--- a/app/src/modules/simulation/conveyor/instances/conveyorInstance/conveyorInstance.tsx
+++ b/app/src/modules/simulation/conveyor/instances/conveyorInstance/conveyorInstance.tsx
@@ -15,7 +15,7 @@ function ConveyorInstance({ conveyor }: { readonly conveyor: ConveyorStatus }) {
     const { setConveyorPaused } = conveyorStore();
 
     useEffect(() => {
-        const product = getProductById(selectedProduct.productId);
+        const product = getProductById(selectedProduct.productUuid);
         if (!product) return;
 
         const conveyorMaterials = getMaterialsByCurrentModelUuid(conveyor.modelUuid);
@@ -53,7 +53,7 @@ function ConveyorInstance({ conveyor }: { readonly conveyor: ConveyorStatus }) {
         //     }
         // });
 
-    }, [materials, conveyor.modelUuid, getMaterialsByCurrentModelUuid, setConveyorPaused, isReset, selectedProduct.productId, getProductById]);
+    }, [materials, conveyor.modelUuid, getMaterialsByCurrentModelUuid, setConveyorPaused, isReset, selectedProduct.productUuid, getProductById]);
 
     useEffect(() => {
         // console.log('conveyor: ', conveyor);
diff --git a/app/src/modules/simulation/events/points/creator/pointsCreator.tsx b/app/src/modules/simulation/events/points/creator/pointsCreator.tsx
index 89513ec..28e948a 100644
--- a/app/src/modules/simulation/events/points/creator/pointsCreator.tsx
+++ b/app/src/modules/simulation/events/points/creator/pointsCreator.tsx
@@ -10,6 +10,7 @@ import { useThree } from "@react-three/fiber";
 import { usePlayButtonStore } from "../../../../../store/usePlayButtonStore";
 import { upsertProductOrEventApi } from "../../../../../services/simulation/products/UpsertProductOrEventApi";
 import { useProductContext } from "../../../products/productContext";
+import { useParams } from "react-router-dom";
 
 function PointsCreator() {
     const { gl, raycaster, scene, pointer, camera } = useThree();
@@ -26,19 +27,18 @@ function PointsCreator() {
     const { setSelectedEventData, clearSelectedEventData } = useSelectedEventData();
     const { isPlaying } = usePlayButtonStore();
 
-    const email = localStorage.getItem('email')
-    const organization = (email!.split("@")[1]).split(".")[0];
+    const { projectId } = useParams();
 
     const updateBackend = (
         productName: string,
-        productId: string,
-        organization: string,
+        productUuid: string,
+        projectId: string,
         eventData: EventsSchema
     ) => {
         upsertProductOrEventApi({
             productName: productName,
-            productId: productId,
-            organization: organization,
+            productUuid: productUuid,
+            projectId: projectId,
             eventDatas: eventData
         })
     }
@@ -97,13 +97,13 @@ function PointsCreator() {
                 selectedEventSphere.rotation.z,
             ];
 
-            const event = getEventByModelUuidFromProduct(selectedProduct.productId, selectedEventSphere.userData.modelUuid);
+            const event = getEventByModelUuidFromProduct(selectedProduct.productUuid, selectedEventSphere.userData.modelUuid);
 
-            if (event && selectedProduct.productId !== '') {
+            if (event && selectedProduct.productUuid !== '') {
 
                 const updatedPoint = JSON.parse(
                     JSON.stringify(
-                        getPointByUuidFromProduct(selectedProduct.productId, selectedEventSphere.userData.modelUuid, selectedEventSphere.userData.pointUuid)
+                        getPointByUuidFromProduct(selectedProduct.productUuid, selectedEventSphere.userData.modelUuid, selectedEventSphere.userData.pointUuid)
                     )
                 );
                 if (updatedPoint) {
@@ -111,7 +111,7 @@ function PointsCreator() {
                     updatedPoint.rotation = point.rotation;
 
                     const updatedEvent = updatePointFromProduct(
-                        selectedProduct.productId,
+                        selectedProduct.productUuid,
                         selectedEventSphere.userData.modelUuid,
                         selectedEventSphere.userData.pointUuid,
                         updatedPoint
@@ -124,8 +124,8 @@ function PointsCreator() {
                         )
                         updateBackend(
                             selectedProduct.productName,
-                            selectedProduct.productId,
-                            organization,
+                            selectedProduct.productUuid,
+                            projectId || '',
                             updatedEvent
                         );
                     }
@@ -184,8 +184,8 @@ function PointsCreator() {
                 <>
                     <group name="EventPointsGroup" visible={!isPlaying}>
                         {events.map((event, index) => {
-                            const updatedEvent = selectedProduct.productId !== ''
-                                ? getEventByModelUuidFromProduct2(selectedProduct.productId, event.modelUuid)
+                            const updatedEvent = selectedProduct.productUuid !== ''
+                                ? getEventByModelUuidFromProduct2(selectedProduct.productUuid, event.modelUuid)
                                 : null;
 
                             const usedEvent = updatedEvent || event;
diff --git a/app/src/modules/simulation/events/points/functions/handleAddEventToProduct.ts b/app/src/modules/simulation/events/points/functions/handleAddEventToProduct.ts
index 86fd13f..06783f9 100644
--- a/app/src/modules/simulation/events/points/functions/handleAddEventToProduct.ts
+++ b/app/src/modules/simulation/events/points/functions/handleAddEventToProduct.ts
@@ -2,30 +2,29 @@ import { upsertProductOrEventApi } from "../../../../../services/simulation/prod
 
 interface HandleAddEventToProductParams {
     event: EventsSchema | undefined;
-    addEvent: (productId: string, event: EventsSchema) => void;
+    addEvent: (productUuid: string, event: EventsSchema) => void;
     selectedProduct: {
-        productId: string;
+        productUuid: string;
         productName: string;
     }
     clearSelectedAsset?: () => void;
+    projectId: string;
 }
 
 export const handleAddEventToProduct = ({
     event,
     addEvent,
     selectedProduct,
-    clearSelectedAsset
+    clearSelectedAsset,
+    projectId
 }: HandleAddEventToProductParams) => {
-    if (event && selectedProduct.productId) {
-        addEvent(selectedProduct.productId, event);
-
-        const email = localStorage.getItem('email')
-        const organization = (email!.split("@")[1]).split(".")[0];
+    if (event && selectedProduct.productUuid) {
+        addEvent(selectedProduct.productUuid, event);
 
         upsertProductOrEventApi({
             productName: selectedProduct.productName,
-            productId: selectedProduct.productId,
-            organization: organization,
+            productUuid: selectedProduct.productUuid,
+            projectId: projectId ||'',
             eventDatas: event
         }).then((data) => {
             // console.log(data);
diff --git a/app/src/modules/simulation/events/triggerConnections/triggerConnector.tsx b/app/src/modules/simulation/events/triggerConnections/triggerConnector.tsx
index 09048b4..894ec35 100644
--- a/app/src/modules/simulation/events/triggerConnections/triggerConnector.tsx
+++ b/app/src/modules/simulation/events/triggerConnections/triggerConnector.tsx
@@ -12,6 +12,7 @@ import { useDeleteTool } from "../../../../store/builder/store";
 import { usePlayButtonStore } from "../../../../store/usePlayButtonStore";
 import { ArrowOnQuadraticBezier, Arrows } from "../arrows/arrows";
 import { useProductContext } from "../../products/productContext";
+import { useParams } from "react-router-dom";
 
 interface ConnectionLine {
     id: string;
@@ -34,9 +35,10 @@ function TriggerConnector() {
     const { deleteTool } = useDeleteTool();
     const { isPlaying } = usePlayButtonStore();
     const { selectedAction } = useSelectedAction();
+    const { projectId } = useParams();
 
     const [firstSelectedPoint, setFirstSelectedPoint] = useState<{
-        productId: string;
+        productUuid: string;
         modelUuid: string;
         pointUuid: string;
         actionUuid?: string;
@@ -44,19 +46,16 @@ function TriggerConnector() {
 
     const [connections, setConnections] = useState<ConnectionLine[]>([]);
 
-    const email = localStorage.getItem('email')
-    const organization = (email!.split("@")[1]).split(".")[0];
-
     const updateBackend = (
         productName: string,
-        productId: string,
-        organization: string,
+        productUuid: string,
+        projectId: string,
         eventData: EventsSchema
     ) => {
         upsertProductOrEventApi({
             productName: productName,
-            productId: productId,
-            organization: organization,
+            productUuid: productUuid,
+            projectId: projectId,
             eventDatas: eventData
         })
     }
@@ -64,7 +63,7 @@ function TriggerConnector() {
     useEffect(() => {
         const newConnections: ConnectionLine[] = [];
 
-        const product = getProductById(selectedProduct.productId);
+        const product = getProductById(selectedProduct.productUuid);
         if (!product || products.length === 0) return;
 
         product.eventDatas.forEach(event => {
@@ -152,7 +151,7 @@ function TriggerConnector() {
         });
 
         setConnections(newConnections);
-    }, [products, selectedProduct.productId]);
+    }, [products, selectedProduct.productUuid]);
 
     useEffect(() => {
         const canvasElement = gl.domElement;
@@ -211,16 +210,16 @@ function TriggerConnector() {
                 return;
             }
 
-            if (selectedProduct && getIsEventInProduct(selectedProduct.productId, modelUuid)) {
+            if (selectedProduct && getIsEventInProduct(selectedProduct.productUuid, modelUuid)) {
 
                 const point = getPointByUuid(
-                    selectedProduct.productId,
+                    selectedProduct.productUuid,
                     modelUuid,
                     pointUuid
                 );
 
-                const event = getEventByModelUuid(selectedProduct.productId, modelUuid);
-                const clickedPointUuid = getPointUuidByActionUuid(selectedProduct.productId, selectedAction.actionId || '');
+                const event = getEventByModelUuid(selectedProduct.productUuid, modelUuid);
+                const clickedPointUuid = getPointUuidByActionUuid(selectedProduct.productUuid, selectedAction.actionId || '');
 
                 if (!point || !event) {
                     setFirstSelectedPoint(null);
@@ -237,7 +236,7 @@ function TriggerConnector() {
                 if (!firstSelectedPoint) {
                     if (point.uuid !== clickedPointUuid) return;
                     setFirstSelectedPoint({
-                        productId: selectedProduct.productId,
+                        productUuid: selectedProduct.productUuid,
                         modelUuid,
                         pointUuid,
                         actionUuid: selectedAction.actionId || ''
@@ -258,40 +257,41 @@ function TriggerConnector() {
                                 pointUuid: point.uuid
                             },
                             triggeredAction: actionUuid ? {
-                                actionName: getActionByUuid(selectedProduct.productId, actionUuid)?.actionName || 'Action',
+                                actionName: getActionByUuid(selectedProduct.productUuid, actionUuid)?.actionName || 'Action',
                                 actionUuid: actionUuid
                             } : null
                         }
                     };
 
                     if (firstSelectedPoint.actionUuid) {
-                        const event = addTrigger(selectedProduct.productId, firstSelectedPoint.actionUuid, trigger);
+                        const event = addTrigger(selectedProduct.productUuid, firstSelectedPoint.actionUuid, trigger);
 
                         if (event) {
                             updateBackend(
                                 selectedProduct.productName,
-                                selectedProduct.productId,
-                                organization,
+                                selectedProduct.productUuid,
+                                projectId || '',
                                 event
                             );
                         }
                     }
                     setFirstSelectedPoint(null);
                 }
-            } else if (!getIsEventInProduct(selectedProduct.productId, modelUuid) && firstSelectedPoint) {
+            } else if (!getIsEventInProduct(selectedProduct.productUuid, modelUuid) && firstSelectedPoint) {
                 handleAddEventToProduct({
                     event: useEventsStore.getState().getEventByModelUuid(modelUuid),
                     addEvent,
                     selectedProduct,
+                    projectId: projectId || ''
                 })
 
                 const point = getPointByUuid(
-                    selectedProduct.productId,
+                    selectedProduct.productUuid,
                     modelUuid,
                     pointUuid
                 );
 
-                const event = getEventByModelUuid(selectedProduct.productId, modelUuid);
+                const event = getEventByModelUuid(selectedProduct.productUuid, modelUuid);
 
                 if (!point || !event) {
                     setFirstSelectedPoint(null);
@@ -320,20 +320,20 @@ function TriggerConnector() {
                             pointUuid: point.uuid
                         },
                         triggeredAction: actionUuid ? {
-                            actionName: getActionByUuid(selectedProduct.productId, actionUuid)?.actionName || 'Action',
+                            actionName: getActionByUuid(selectedProduct.productUuid, actionUuid)?.actionName || 'Action',
                             actionUuid: actionUuid
                         } : null
                     }
                 };
 
                 if (firstSelectedPoint.actionUuid) {
-                    const event = addTrigger(selectedProduct.productId, firstSelectedPoint.actionUuid, trigger);
+                    const event = addTrigger(selectedProduct.productUuid, firstSelectedPoint.actionUuid, trigger);
 
                     if (event) {
                         updateBackend(
                             selectedProduct.productName,
-                            selectedProduct.productId,
-                            organization,
+                            selectedProduct.productUuid,
+                            projectId || '',
                             event
                         );
                     }
@@ -442,12 +442,12 @@ function TriggerConnector() {
 
     const removeConnection = (connection: ConnectionLine) => {
         if (connection.trigger.triggerUuid) {
-            const event = removeTrigger(selectedProduct.productId, connection.trigger.triggerUuid);
+            const event = removeTrigger(selectedProduct.productUuid, connection.trigger.triggerUuid);
             if (event) {
                 updateBackend(
                     selectedProduct.productName,
-                    selectedProduct.productId,
-                    organization,
+                    selectedProduct.productUuid,
+                    projectId || '',
                     event
                 );
             }
diff --git a/app/src/modules/simulation/machine/instances/machineInstance/machineInstance.tsx b/app/src/modules/simulation/machine/instances/machineInstance/machineInstance.tsx
index 2356e76..2d87bf2 100644
--- a/app/src/modules/simulation/machine/instances/machineInstance/machineInstance.tsx
+++ b/app/src/modules/simulation/machine/instances/machineInstance/machineInstance.tsx
@@ -121,7 +121,7 @@ function MachineInstance({ machineDetail }: { readonly machineDetail: MachineSta
             machineStatus(machineDetail.modelUuid, "Machine has completed the processing")
 
             if (machineDetail.currentAction) {
-                const action = getActionByUuid(selectedProduct.productId, machineDetail.currentAction.actionUuid);
+                const action = getActionByUuid(selectedProduct.productUuid, machineDetail.currentAction.actionUuid);
                 if (action && machineDetail.currentAction.materialId) {
                     triggerPointActions(action, machineDetail.currentAction.materialId)
                 }
diff --git a/app/src/modules/simulation/materials/instances/instance/materialInstance.tsx b/app/src/modules/simulation/materials/instances/instance/materialInstance.tsx
index 9826ad9..5d62170 100644
--- a/app/src/modules/simulation/materials/instances/instance/materialInstance.tsx
+++ b/app/src/modules/simulation/materials/instances/instance/materialInstance.tsx
@@ -31,14 +31,14 @@ function MaterialInstance({ material }: { readonly material: MaterialSchema }) {
             return { position: new THREE.Vector3(0, 0, 0), rotation: new THREE.Vector3(0, 0, 0), currentSpeed: 1 };
         }
 
-        const modelUuid = getModelUuidByPointUuid(selectedProduct.productId, material.current.pointUuid);
+        const modelUuid = getModelUuidByPointUuid(selectedProduct.productUuid, material.current.pointUuid);
         if (!modelUuid) {
             return { position: new THREE.Vector3(0, 0, 0), rotation: new THREE.Vector3(0, 0, 0), currentSpeed: 1 };
         }
 
-        const currentSpeed = getCurrentSpeed(selectedProduct.productId, modelUuid);
+        const currentSpeed = getCurrentSpeed(selectedProduct.productUuid, modelUuid);
 
-        const point = getPointByUuid(selectedProduct.productId, modelUuid, material.current.pointUuid);
+        const point = getPointByUuid(selectedProduct.productUuid, modelUuid, material.current.pointUuid);
         if (!point) {
             return { position: new THREE.Vector3(0, 0, 0), rotation: new THREE.Vector3(0, 0, 0), currentSpeed: currentSpeed || 1 };
         }
@@ -56,8 +56,8 @@ function MaterialInstance({ material }: { readonly material: MaterialSchema }) {
     }, [material, getPointByUuid]);
 
 
-    function getCurrentSpeed(productId: string, modelUuid: string) {
-        const event = getEventByModelUuid(productId, modelUuid)
+    function getCurrentSpeed(productUuid: string, modelUuid: string) {
+        const event = getEventByModelUuid(productUuid, modelUuid)
         if (event) {
             if (event.type === 'transfer') {
                 return event.speed;
@@ -86,7 +86,7 @@ function MaterialInstance({ material }: { readonly material: MaterialSchema }) {
 
     const callTrigger = () => {
         if (!material.next) return;
-        const action = getActionByPointUuid(selectedProduct.productId, material.next.pointUuid);
+        const action = getActionByPointUuid(selectedProduct.productUuid, material.next.pointUuid);
         if (action) {
             triggerPointActions(action, material.materialId);
         }
diff --git a/app/src/modules/simulation/products/products.tsx b/app/src/modules/simulation/products/products.tsx
index 7e019a5..0b26902 100644
--- a/app/src/modules/simulation/products/products.tsx
+++ b/app/src/modules/simulation/products/products.tsx
@@ -7,6 +7,7 @@ import { usePlayButtonStore, useResetButtonStore } from '../../../store/usePlayB
 import { useSceneContext } from '../../scene/sceneContext';
 import { useProductContext } from './productContext';
 import { useComparisonProduct, useMainProduct } from '../../../store/simulation/useSimulationStore';
+import { useParams } from 'react-router-dom';
 
 function Products() {
     const { armBotStore, machineStore, conveyorStore, vehicleStore, storageUnitStore, layout } = useSceneContext();
@@ -22,48 +23,52 @@ function Products() {
     const { isPlaying } = usePlayButtonStore();
     const { mainProduct } = useMainProduct();
     const { comparisonProduct } = useComparisonProduct();
+    const { projectId } = useParams();
 
     useEffect(() => {
         if (layout === 'Main Layout' && mainProduct) {
-            setSelectedProduct(mainProduct.productId, mainProduct.productName);
+            setSelectedProduct(mainProduct.productUuid, mainProduct.productName);
         }
     }, [mainProduct])
 
     useEffect(() => {
         if (layout === 'Comparison Layout' && comparisonProduct) {
-            setSelectedProduct(comparisonProduct.productId, comparisonProduct.productName);
+            setSelectedProduct(comparisonProduct.productUuid, comparisonProduct.productName);
         }
     }, [comparisonProduct])
 
     useEffect(() => {
-        const email = localStorage.getItem('email')
-        const organization = (email!.split("@")[1]).split(".")[0];
-        getAllProductsApi(organization).then((data) => {
+        getAllProductsApi(projectId || '').then((data) => {
             if (data.length === 0) {
                 const id = THREE.MathUtils.generateUUID();
                 const name = 'Product 1';
                 addProduct(name, id);
-                upsertProductOrEventApi({ productName: name, productId: id, organization: organization })
+                console.log(name, id, projectId);
+                upsertProductOrEventApi({
+                    productName: name,
+                    productUuid: id,
+                    projectId: projectId || ''
+                })
                 if (layout === 'Main Layout') {
                     setSelectedProduct(id, name);
                 }
             } else {
                 setProducts(data);
                 if (layout === 'Main Layout') {
-                    setSelectedProduct(data[0].productId, data[0].productName);
+                    setSelectedProduct(data[0].productUuid, data[0].productName);
                 }
             }
         })
     }, [])
 
     useEffect(() => {
-        if (selectedProduct.productId) {
-            const product = getProductById(selectedProduct.productId);
+        if (selectedProduct.productUuid) {
+            const product = getProductById(selectedProduct.productUuid);
             if (product) {
                 clearvehicles();
                 product.eventDatas.forEach(events => {
                     if (events.type === 'vehicle') {
-                        addVehicle(selectedProduct.productId, events);
+                        addVehicle(selectedProduct.productUuid, events);
                     }
                 });
             }
@@ -71,13 +76,13 @@ function Products() {
     }, [selectedProduct, products, isReset, isPlaying]);
 
     useEffect(() => {
-        if (selectedProduct.productId) {
-            const product = getProductById(selectedProduct.productId);
+        if (selectedProduct.productUuid) {
+            const product = getProductById(selectedProduct.productUuid);
             if (product) {
                 clearArmBots();
                 product.eventDatas.forEach(events => {
                     if (events.type === 'roboticArm') {
-                        addArmBot(selectedProduct.productId, events);
+                        addArmBot(selectedProduct.productUuid, events);
                     }
                 });
             }
@@ -85,13 +90,13 @@ function Products() {
     }, [selectedProduct, products, isReset, isPlaying]);
 
     useEffect(() => {
-        if (selectedProduct.productId) {
-            const product = getProductById(selectedProduct.productId);
+        if (selectedProduct.productUuid) {
+            const product = getProductById(selectedProduct.productUuid);
             if (product) {
                 clearConveyors();
                 product.eventDatas.forEach(events => {
                     if (events.type === 'transfer') {
-                        addConveyor(selectedProduct.productId, events);
+                        addConveyor(selectedProduct.productUuid, events);
                     }
                 });
             }
@@ -99,13 +104,13 @@ function Products() {
     }, [selectedProduct, products, isReset, isPlaying]);
 
     useEffect(() => {
-        if (selectedProduct.productId) {
-            const product = getProductById(selectedProduct.productId);
+        if (selectedProduct.productUuid) {
+            const product = getProductById(selectedProduct.productUuid);
             if (product) {
                 clearMachines();
                 product.eventDatas.forEach(events => {
                     if (events.type === 'machine') {
-                        addMachine(selectedProduct.productId, events);
+                        addMachine(selectedProduct.productUuid, events);
                     }
                 });
             }
@@ -113,13 +118,13 @@ function Products() {
     }, [selectedProduct, products, isReset, isPlaying]);
 
     useEffect(() => {
-        if (selectedProduct.productId) {
-            const product = getProductById(selectedProduct.productId);
+        if (selectedProduct.productUuid) {
+            const product = getProductById(selectedProduct.productUuid);
             if (product) {
                 clearStorageUnits();
                 product.eventDatas.forEach(event => {
                     if (event.type === 'storageUnit') {
-                        addStorageUnit(selectedProduct.productId, event);
+                        addStorageUnit(selectedProduct.productUuid, event);
 
                         if (event.point.action.actionType === 'retrieve') {
                             const storageAction = event.point.action;
diff --git a/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx b/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx
index 40cd0f1..f773b7c 100644
--- a/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx
+++ b/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx
@@ -52,13 +52,13 @@ function RoboticArmInstance({ armBot }: { readonly armBot: ArmBotStatus }) {
         step();
     }
 
-    const action = getActionByUuid(selectedProduct.productId, armBot.currentAction?.actionUuid || '');
+    const action = getActionByUuid(selectedProduct.productUuid, armBot.currentAction?.actionUuid || '');
 
     const handlePickUpTrigger = () => {
         if (armBot.currentAction && armBot.currentAction.materialId) {
             const material = getMaterialById(armBot.currentAction.materialId);
             if (material && material.previous && material.previous.modelUuid) {
-                const previousModel = getEventByActionUuid(selectedProduct.productId, material.previous.actionUuid);
+                const previousModel = getEventByActionUuid(selectedProduct.productUuid, material.previous.actionUuid);
                 if (previousModel) {
                     if (previousModel.type === 'transfer') {
                         setIsVisible(armBot.currentAction.materialId, false);
@@ -85,8 +85,8 @@ function RoboticArmInstance({ armBot }: { readonly armBot: ArmBotStatus }) {
     const handleDropTrigger = () => {
 
         if (armBot.currentAction) {
-            const action = getActionByUuid(selectedProduct.productId, armBot.currentAction.actionUuid);
-            const model = getEventByModelUuid(selectedProduct.productId, action?.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid || '');
+            const action = getActionByUuid(selectedProduct.productUuid, armBot.currentAction.actionUuid);
+            const model = getEventByModelUuid(selectedProduct.productUuid, action?.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid || '');
             if (action && action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid) {
                 if (!model) return;
                 if (model.type === 'transfer') {
diff --git a/app/src/modules/simulation/simulator/functions/checkActiveRoboticArmsInSubsequence.ts b/app/src/modules/simulation/simulator/functions/checkActiveRoboticArmsInSubsequence.ts
index bfa8bfa..8275fb3 100644
--- a/app/src/modules/simulation/simulator/functions/checkActiveRoboticArmsInSubsequence.ts
+++ b/app/src/modules/simulation/simulator/functions/checkActiveRoboticArmsInSubsequence.ts
@@ -4,7 +4,7 @@ import { extractTriggersFromPoint } from "./extractTriggersFromPoint";
 export function getRoboticArmSequencesInProduct(
     product: {
         productName: string;
-        productId: string;
+        productUuid: string;
         eventDatas: EventsSchema[];
     }
 ): EventsSchema[][][] {
@@ -48,7 +48,7 @@ export function getRoboticArmSequencesInProduct(
 export function findRoboticArmSubsequence(
     product: {
         productName: string;
-        productId: string;
+        productUuid: string;
         eventDatas: EventsSchema[];
     },
     roboticArmModelUuid: string
@@ -85,7 +85,7 @@ export function useCheckActiveRoboticArmsInSubsequence() {
 
     return function (product: {
         productName: string;
-        productId: string;
+        productUuid: string;
         eventDatas: EventsSchema[];
     }, roboticArmModelUuid: string) {
         const result = findRoboticArmSubsequence(product, roboticArmModelUuid);
diff --git a/app/src/modules/simulation/simulator/functions/getConveyorSequencesInProduct.ts b/app/src/modules/simulation/simulator/functions/getConveyorSequencesInProduct.ts
index 8c2cc49..8ad5e10 100644
--- a/app/src/modules/simulation/simulator/functions/getConveyorSequencesInProduct.ts
+++ b/app/src/modules/simulation/simulator/functions/getConveyorSequencesInProduct.ts
@@ -4,7 +4,7 @@ import { extractTriggersFromPoint } from "./extractTriggersFromPoint";
 export function getConveyorSequencesInProduct(
     product: {
         productName: string;
-        productId: string;
+        productUuid: string;
         eventDatas: EventsSchema[];
     }
 ): EventsSchema[][][] {
@@ -44,7 +44,7 @@ export function getConveyorSequencesInProduct(
 export function findConveyorSubsequence(
     product: {
         productName: string;
-        productId: string;
+        productUuid: string;
         eventDatas: EventsSchema[];
     },
     conveyorModelUuid: string
diff --git a/app/src/modules/simulation/simulator/simulator.tsx b/app/src/modules/simulation/simulator/simulator.tsx
index ecd50b2..5b2f8a8 100644
--- a/app/src/modules/simulation/simulator/simulator.tsx
+++ b/app/src/modules/simulation/simulator/simulator.tsx
@@ -14,9 +14,9 @@ function Simulator() {
     const { isReset } = useResetButtonStore();
 
     useEffect(() => {
-        if (!isPlaying || isReset || !selectedProduct.productId) return;
+        if (!isPlaying || isReset || !selectedProduct.productUuid) return;
 
-        const product = getProductById(selectedProduct.productId);
+        const product = getProductById(selectedProduct.productUuid);
         if (!product) return;
 
         const executionOrder = determineExecutionOrder([product]);
diff --git a/app/src/modules/simulation/spatialUI/arm/armBotUI.tsx b/app/src/modules/simulation/spatialUI/arm/armBotUI.tsx
index 5624582..c0d7d9e 100644
--- a/app/src/modules/simulation/spatialUI/arm/armBotUI.tsx
+++ b/app/src/modules/simulation/spatialUI/arm/armBotUI.tsx
@@ -12,6 +12,7 @@ import armDrop from "../../../../assets/gltf-glb/ui/arm_ui_drop.glb";
 import { upsertProductOrEventApi } from '../../../../services/simulation/products/UpsertProductOrEventApi';
 import { useSceneContext } from '../../../scene/sceneContext';
 import { useProductContext } from '../../products/productContext';
+import { useParams } from 'react-router-dom';
 
 type Positions = {
     pick: [number, number, number];
@@ -28,6 +29,7 @@ const ArmBotUI = () => {
     const { selectedAction } = useSelectedAction();
     const { armBotStore } = useSceneContext();
     const { armBots } = armBotStore();
+    const { projectId } = useParams();
 
     const armUiPick = useGLTF(armPick) as any;
     const armUiDrop = useGLTF(armDrop) as any;
@@ -36,19 +38,16 @@ const ArmBotUI = () => {
     const [endPosition, setEndPosition] = useState<[number, number, number] | null>([0, 0, 0]);
     const [selectedArmBotData, setSelectedArmBotData] = useState<any>(null);
 
-    const email = localStorage.getItem('email')
-    const organization = (email!.split("@")[1]).split(".")[0];
-
     const updateBackend = (
         productName: string,
-        productId: string,
-        organization: string,
+        productUuid: string,
+        projectId: string,
         eventData: EventsSchema
     ) => {
         upsertProductOrEventApi({
             productName: productName,
-            productId: productId,
-            organization: organization,
+            productUuid: productUuid,
+            projectId: projectId,
             eventDatas: eventData
         })
     }
@@ -56,12 +55,12 @@ const ArmBotUI = () => {
     // Fetch and setup selected ArmBot data
     useEffect(() => {
         if (selectedEventSphere) {
-            const selectedArmBot = getEventByModelUuid(selectedProduct.productId, selectedEventSphere.userData.modelUuid);
+            const selectedArmBot = getEventByModelUuid(selectedProduct.productUuid, selectedEventSphere.userData.modelUuid);
 
             if (selectedArmBot?.type === "roboticArm" && selectedAction.actionId) {
                 setSelectedArmBotData(selectedArmBot);
                 const defaultPositions = getDefaultPositions(selectedArmBot.modelUuid);
-                const matchingAction = getActionByUuid(selectedProduct.productId, selectedAction.actionId);
+                const matchingAction = getActionByUuid(selectedProduct.productUuid, selectedAction.actionId);
                 if (matchingAction && (matchingAction as RoboticArmPointSchema["actions"][0]).process) {
                     const startPoint = (matchingAction as RoboticArmPointSchema["actions"][0]).process.startPoint;
                     const pickPosition = (!startPoint || (Array.isArray(startPoint) && startPoint.every(v => v === 0)))
@@ -81,7 +80,7 @@ const ArmBotUI = () => {
     }, [armBots, selectedEventSphere, selectedProduct, getEventByModelUuid, selectedAction]);
 
     function getDefaultPositions(modelUuid: string): Positions {
-        const modelData = getEventByModelUuid(selectedProduct.productId, modelUuid);
+        const modelData = getEventByModelUuid(selectedProduct.productUuid, modelUuid);
 
         if (modelData?.type === "roboticArm") {
             const baseX = modelData.point.position?.[0] || 0;
@@ -122,7 +121,7 @@ const ArmBotUI = () => {
         const worldPositionArray = newPosition.toArray() as [number, number, number];
 
         if (selectedEventSphere) {
-            const selectedArmBot = getEventByModelUuid(selectedProduct.productId, selectedEventSphere.userData.modelUuid);
+            const selectedArmBot = getEventByModelUuid(selectedProduct.productUuid, selectedEventSphere.userData.modelUuid);
 
             const armBot = selectedArmBot?.modelUuid === modelUuid ? selectedArmBot : null;
             if (!armBot) return;
@@ -141,7 +140,7 @@ const ArmBotUI = () => {
                             setEndPosition(updatedProcess.endPoint)
                         }
 
-                        const event = updateAction(selectedProduct.productId,
+                        const event = updateAction(selectedProduct.productUuid,
                             actionUuid,
                             {
                                 actionUuid: action.actionUuid,
@@ -152,8 +151,8 @@ const ArmBotUI = () => {
                         if (event) {
                             updateBackend(
                                 selectedProduct.productName,
-                                selectedProduct.productId,
-                                organization,
+                                selectedProduct.productUuid,
+                                projectId || '',
                                 event
                             );
                         }
diff --git a/app/src/modules/simulation/spatialUI/arm/useDraggableGLTF.ts b/app/src/modules/simulation/spatialUI/arm/useDraggableGLTF.ts
index 8794ffd..418376a 100644
--- a/app/src/modules/simulation/spatialUI/arm/useDraggableGLTF.ts
+++ b/app/src/modules/simulation/spatialUI/arm/useDraggableGLTF.ts
@@ -70,7 +70,7 @@ export default function useDraggableGLTF(onUpdate: OnUpdateCallback) {
         if (!activeObjRef.current) return;
         if (selectedEventData?.data.type === "roboticArm") {
             const selectedArmBot = getEventByModelUuid(
-                selectedProduct.productId,
+                selectedProduct.productUuid,
                 selectedEventData.data.modelUuid
             );
             if (!selectedArmBot) return;
diff --git a/app/src/modules/simulation/spatialUI/vehicle/vehicleUI.tsx b/app/src/modules/simulation/spatialUI/vehicle/vehicleUI.tsx
index 8765d14..bb69743 100644
--- a/app/src/modules/simulation/spatialUI/vehicle/vehicleUI.tsx
+++ b/app/src/modules/simulation/spatialUI/vehicle/vehicleUI.tsx
@@ -2,11 +2,7 @@ import { useEffect, useRef, useState } from "react";
 import * as Types from "../../../../types/world/worldTypes";
 import { useGLTF } from "@react-three/drei";
 import { useFrame, useThree } from "@react-three/fiber";
-import {
-  useSelectedEventSphere,
-  useIsDragging,
-  useIsRotating,
-} from "../../../../store/simulation/useSimulationStore";
+import { useSelectedEventSphere, useIsDragging, useIsRotating, } from "../../../../store/simulation/useSimulationStore";
 import { useProductStore } from "../../../../store/simulation/useProductStore";
 import { upsertProductOrEventApi } from "../../../../services/simulation/products/UpsertProductOrEventApi";
 import { DoubleSide, Group, Plane, Vector3 } from "three";
@@ -15,398 +11,370 @@ import startPoint from "../../../../assets/gltf-glb/ui/arrow_green.glb";
 import startEnd from "../../../../assets/gltf-glb/ui/arrow_red.glb";
 import { useSceneContext } from "../../../scene/sceneContext";
 import { useProductContext } from "../../products/productContext";
+import { useParams } from "react-router-dom";
 
 const VehicleUI = () => {
-  const { scene: startScene } = useGLTF(startPoint) as any;
-  const { scene: endScene } = useGLTF(startEnd) as any;
-  const startMarker = useRef<Group>(null);
-  const endMarker = useRef<Group>(null);
-  const prevMousePos = useRef({ x: 0, y: 0 });
-  const { selectedEventSphere } = useSelectedEventSphere();
-  const { selectedProductStore } = useProductContext();
-  const { vehicleStore } = useSceneContext();
-  const { selectedProduct } = selectedProductStore();
-  const { vehicles, getVehicleById } = vehicleStore();
-  const { updateEvent } = useProductStore();
-  const [startPosition, setStartPosition] = useState<[number, number, number]>([
-    0, 1, 0,
-  ]);
+    const { scene: startScene } = useGLTF(startPoint) as any;
+    const { scene: endScene } = useGLTF(startEnd) as any;
+    const startMarker = useRef<Group>(null);
+    const endMarker = useRef<Group>(null);
+    const prevMousePos = useRef({ x: 0, y: 0 });
+    const { selectedEventSphere } = useSelectedEventSphere();
+    const { selectedProductStore } = useProductContext();
+    const { vehicleStore } = useSceneContext();
+    const { selectedProduct } = selectedProductStore();
+    const { vehicles, getVehicleById } = vehicleStore();
+    const { updateEvent } = useProductStore();
+    const [startPosition, setStartPosition] = useState<[number, number, number]>([0, 1, 0,]);
 
-  const [endPosition, setEndPosition] = useState<[number, number, number]>([
-    0, 1, 0,
-  ]);
-  const [startRotation, setStartRotation] = useState<[number, number, number]>([
-    0, 0, 0,
-  ]);
+    const [endPosition, setEndPosition] = useState<[number, number, number]>([0, 1, 0,]);
+    const [startRotation, setStartRotation] = useState<[number, number, number]>([0, 0, 0,]);
 
-  const [endRotation, setEndRotation] = useState<[number, number, number]>([
-    0, 0, 0,
-  ]);
-  const [steeringRotation, setSteeringRotation] = useState<
-    [number, number, number]
-  >([0, 0, 0]);
+    const [endRotation, setEndRotation] = useState<[number, number, number]>([0, 0, 0,]);
+    const [steeringRotation, setSteeringRotation] = useState<[number, number, number]>([0, 0, 0]);
 
-  const { isDragging, setIsDragging } = useIsDragging();
-  const { isRotating, setIsRotating } = useIsRotating();
-  const { raycaster } = useThree();
-  const [point, setPoint] = useState<[number, number, number]>([0, 0, 0]);
-  const plane = useRef(new Plane(new Vector3(0, 1, 0), 0));
-  const [tubeRotation, setTubeRotation] = useState<boolean>(false);
-  const tubeRef = useRef<Group>(null);
-  const outerGroup = useRef<Group>(null);
-  const state: Types.ThreeState = useThree();
-  const controls: any = state.controls;
-  const [selectedVehicleData, setSelectedVechicleData] = useState<{
-    position: [number, number, number];
-    rotation: [number, number, number];
-  }>({ position: [0, 0, 0], rotation: [0, 0, 0] });
-  const CIRCLE_RADIUS = 0.8;
-  const email = localStorage.getItem("email");
-  const organization = email!.split("@")[1].split(".")[0];
+    const { isDragging, setIsDragging } = useIsDragging();
+    const { isRotating, setIsRotating } = useIsRotating();
+    const { raycaster } = useThree();
+    const [point, setPoint] = useState<[number, number, number]>([0, 0, 0]);
+    const plane = useRef(new Plane(new Vector3(0, 1, 0), 0));
+    const [tubeRotation, setTubeRotation] = useState<boolean>(false);
+    const tubeRef = useRef<Group>(null);
+    const outerGroup = useRef<Group>(null);
+    const state: Types.ThreeState = useThree();
+    const controls: any = state.controls;
+    const [selectedVehicleData, setSelectedVechicleData] = useState<{ position: [number, number, number]; rotation: [number, number, number]; }>({ position: [0, 0, 0], rotation: [0, 0, 0] });
+    const CIRCLE_RADIUS = 0.8;
+    const { projectId } = useParams();
 
-  const updateBackend = (
-    productName: string,
-    productId: string,
-    organization: string,
-    eventData: EventsSchema
-  ) => {
-    upsertProductOrEventApi({
-      productName: productName,
-      productId: productId,
-      organization: organization,
-      eventDatas: eventData,
+    const updateBackend = (
+        productName: string,
+        productUuid: string,
+        projectId: string,
+        eventData: EventsSchema
+    ) => {
+        upsertProductOrEventApi({
+            productName: productName,
+            productUuid: productUuid,
+            projectId: projectId,
+            eventDatas: eventData,
+        });
+    };
+
+    useEffect(() => {
+        if (!selectedEventSphere) return;
+        const selectedVehicle = getVehicleById(
+            selectedEventSphere.userData.modelUuid
+        );
+
+        if (selectedVehicle) {
+            setSelectedVechicleData({
+                position: selectedVehicle.position,
+                rotation: selectedVehicle.rotation,
+            });
+            setPoint(selectedVehicle.point.position);
+        }
+
+        setTimeout(() => {
+            if (selectedVehicle?.point?.action) {
+                const { pickUpPoint, unLoadPoint, steeringAngle } = selectedVehicle.point.action;
+
+                if (pickUpPoint && outerGroup.current) {
+                    const worldPos = new Vector3(
+                        pickUpPoint.position.x,
+                        pickUpPoint.position.y,
+                        pickUpPoint.position.z
+                    );
+                    const localPosition = outerGroup.current.worldToLocal(worldPos.clone());
+
+                    setStartPosition([
+                        localPosition.x,
+                        selectedVehicle.point.position[1],
+                        localPosition.z,
+                    ]);
+                    setStartRotation([
+                        pickUpPoint.rotation.x,
+                        pickUpPoint.rotation.y,
+                        pickUpPoint.rotation.z,
+                    ]);
+                } else {
+                    setStartPosition([0, selectedVehicle.point.position[1] + 0.1, 1.5]);
+                    setStartRotation([0, 0, 0]);
+                }
+                // end point
+                if (unLoadPoint && outerGroup.current) {
+                    const worldPos = new Vector3(
+                        unLoadPoint.position.x,
+                        unLoadPoint.position.y,
+                        unLoadPoint.position.z
+                    );
+                    const localPosition = outerGroup.current.worldToLocal(worldPos);
+
+                    setEndPosition([
+                        localPosition.x,
+                        selectedVehicle.point.position[1],
+                        localPosition.z,
+                    ]);
+                    setEndRotation([
+                        unLoadPoint.rotation.x,
+                        unLoadPoint.rotation.y,
+                        unLoadPoint.rotation.z,
+                    ]);
+                } else {
+                    setEndPosition([0, selectedVehicle.point.position[1] + 0.1, -1.5]);
+                    setEndRotation([0, 0, 0]);
+                }
+                setSteeringRotation([0, steeringAngle, 0]);
+            }
+        }, 10);
+    }, [selectedEventSphere, outerGroup.current, vehicles]);
+
+    const handlePointerDown = (
+        e: any,
+        state: "start" | "end",
+        rotation: "start" | "end"
+    ) => {
+        if (e.object.name === "handle") {
+            const normalizedX = (e.clientX / window.innerWidth) * 2 - 1;
+            const normalizedY = -(e.clientY / window.innerHeight) * 2 + 1;
+            prevMousePos.current = { x: normalizedX, y: normalizedY };
+            setIsRotating(rotation);
+            if (controls) controls.enabled = false;
+            setIsDragging(null);
+        } else {
+            setIsDragging(state);
+            setIsRotating(null);
+            if (controls) controls.enabled = false;
+        }
+    };
+
+    const handlePointerUp = () => {
+        controls.enabled = true;
+        setIsDragging(null);
+        setIsRotating(null);
+
+        if (selectedEventSphere?.userData.modelUuid) {
+            const updatedVehicle = getVehicleById(selectedEventSphere.userData.modelUuid);
+
+            let globalStartPosition = null;
+            let globalEndPosition = null;
+
+            if (outerGroup.current && startMarker.current && endMarker.current) {
+                const worldPosStart = new Vector3(...startPosition);
+                globalStartPosition = outerGroup.current.localToWorld(
+                    worldPosStart.clone()
+                );
+                const worldPosEnd = new Vector3(...endPosition);
+                globalEndPosition = outerGroup.current.localToWorld(
+                    worldPosEnd.clone()
+                );
+            }
+            if (updatedVehicle && globalEndPosition && globalStartPosition) {
+                const event = updateEvent(
+                    selectedProduct.productUuid,
+                    selectedEventSphere.userData.modelUuid,
+                    {
+                        point: {
+                            ...updatedVehicle.point,
+                            action: {
+                                ...updatedVehicle.point?.action,
+                                pickUpPoint: {
+                                    position: {
+                                        x: globalStartPosition.x,
+                                        y: 0,
+                                        z: globalStartPosition.z,
+                                    },
+                                    rotation: { x: 0, y: startRotation[1], z: 0 },
+                                },
+                                unLoadPoint: {
+                                    position: {
+                                        x: globalEndPosition.x,
+                                        y: 0,
+                                        z: globalEndPosition.z,
+                                    },
+                                    rotation: { x: 0, y: endRotation[1], z: 0 },
+                                },
+                                steeringAngle: steeringRotation[1],
+                            },
+                        },
+                    }
+                );
+
+                if (event) {
+                    updateBackend(
+                        selectedProduct.productName,
+                        selectedProduct.productUuid,
+                        projectId || '',
+                        event
+                    );
+                }
+            }
+        }
+    };
+
+    useFrame(() => {
+        if (!isDragging || !plane.current || !raycaster || !outerGroup.current) return;
+        const intersectPoint = new Vector3();
+        const intersects = raycaster.ray.intersectPlane(
+            plane.current,
+            intersectPoint
+        );
+        if (!intersects) return;
+        const localPoint = outerGroup?.current.worldToLocal(intersectPoint.clone());
+        if (isDragging === "start") {
+            setStartPosition([localPoint.x, point[1], localPoint.z]);
+        } else if (isDragging === "end") {
+            setEndPosition([localPoint.x, point[1], localPoint.z]);
+        }
     });
-  };
 
-  useEffect(() => {
-    if (!selectedEventSphere) return;
-    const selectedVehicle = getVehicleById(
-      selectedEventSphere.userData.modelUuid
-    );
+    useEffect(() => {
+        const handleGlobalPointerUp = () => {
+            setIsDragging(null);
+            setIsRotating(null);
+            setTubeRotation(false);
+            if (controls) controls.enabled = true;
+            handlePointerUp();
+        };
 
-    if (selectedVehicle) {
-      setSelectedVechicleData({
-        position: selectedVehicle.position,
-        rotation: selectedVehicle.rotation,
-      });
-      setPoint(selectedVehicle.point.position);
-    }
+        if (isDragging || isRotating || tubeRotation) {
+            window.addEventListener("pointerup", handleGlobalPointerUp);
+        }
 
-    setTimeout(() => {
-      if (selectedVehicle?.point?.action) {
-        const { pickUpPoint, unLoadPoint, steeringAngle } =
-          selectedVehicle.point.action;
+        return () => {
+            window.removeEventListener("pointerup", handleGlobalPointerUp);
+        };
+    }, [isDragging, isRotating, startPosition, startRotation, endPosition, endRotation, tubeRotation, steeringRotation, outerGroup.current, tubeRef.current,]);
 
-        if (pickUpPoint && outerGroup.current) {
-          const worldPos = new Vector3(
-            pickUpPoint.position.x,
-            pickUpPoint.position.y,
-            pickUpPoint.position.z
-          );
-          const localPosition = outerGroup.current.worldToLocal(
-            worldPos.clone()
-          );
+    const prevSteeringY = useRef(0);
 
-          setStartPosition([
-            localPosition.x,
-            selectedVehicle.point.position[1],
-            localPosition.z,
-          ]);
-          setStartRotation([
-            pickUpPoint.rotation.x,
-            pickUpPoint.rotation.y,
-            pickUpPoint.rotation.z,
-          ]);
+    useFrame((state) => {
+        if (tubeRotation) {
+            const currentPointerX = state.pointer.x;
+            const deltaX = currentPointerX - prevMousePos.current.x;
+            prevMousePos.current.x = currentPointerX;
+
+            const marker = tubeRef.current;
+            if (marker) {
+                const rotationSpeed = 2;
+                marker.rotation.y += deltaX * rotationSpeed;
+                setSteeringRotation([
+                    marker.rotation.x,
+                    marker.rotation.y,
+                    marker.rotation.z,
+                ]);
+            }
         } else {
-          setStartPosition([0, selectedVehicle.point.position[1] + 0.1, 1.5]);
-          setStartRotation([0, 0, 0]);
+            prevSteeringY.current = 0;
         }
-        // end point
-        if (unLoadPoint && outerGroup.current) {
-          const worldPos = new Vector3(
-            unLoadPoint.position.x,
-            unLoadPoint.position.y,
-            unLoadPoint.position.z
-          );
-          const localPosition = outerGroup.current.worldToLocal(worldPos);
+    });
 
-          setEndPosition([
-            localPosition.x,
-            selectedVehicle.point.position[1],
-            localPosition.z,
-          ]);
-          setEndRotation([
-            unLoadPoint.rotation.x,
-            unLoadPoint.rotation.y,
-            unLoadPoint.rotation.z,
-          ]);
-        } else {
-          setEndPosition([0, selectedVehicle.point.position[1] + 0.1, -1.5]);
-          setEndRotation([0, 0, 0]);
+    useFrame((state) => {
+        if (!isRotating) return;
+        const currentPointerX = state.pointer.x;
+        const deltaX = currentPointerX - prevMousePos.current.x;
+        prevMousePos.current.x = currentPointerX;
+        const marker =
+            isRotating === "start" ? startMarker.current : endMarker.current;
+        if (marker) {
+            const rotationSpeed = 10;
+            marker.rotation.y += deltaX * rotationSpeed;
+            if (isRotating === "start") {
+                setStartRotation([
+                    marker.rotation.x,
+                    marker.rotation.y,
+                    marker.rotation.z,
+                ]);
+            } else {
+                setEndRotation([
+                    marker.rotation.x,
+                    marker.rotation.y,
+                    marker.rotation.z,
+                ]);
+            }
         }
-        setSteeringRotation([0, steeringAngle, 0]);
-      }
-    }, 10);
-  }, [selectedEventSphere, outerGroup.current, vehicles]);
+    });
 
-  const handlePointerDown = (
-    e: any,
-    state: "start" | "end",
-    rotation: "start" | "end"
-  ) => {
-    if (e.object.name === "handle") {
-      const normalizedX = (e.clientX / window.innerWidth) * 2 - 1;
-      const normalizedY = -(e.clientY / window.innerHeight) * 2 + 1;
-      prevMousePos.current = { x: normalizedX, y: normalizedY };
-      setIsRotating(rotation);
-      if (controls) controls.enabled = false;
-      setIsDragging(null);
-    } else {
-      setIsDragging(state);
-      setIsRotating(null);
-      if (controls) controls.enabled = false;
-    }
-  };
-
-  const handlePointerUp = () => {
-    controls.enabled = true;
-    setIsDragging(null);
-    setIsRotating(null);
-
-    if (selectedEventSphere?.userData.modelUuid) {
-      const updatedVehicle = getVehicleById(
-        selectedEventSphere.userData.modelUuid
-      );
-
-      let globalStartPosition = null;
-      let globalEndPosition = null;
-
-      if (outerGroup.current && startMarker.current && endMarker.current) {
-        const worldPosStart = new Vector3(...startPosition);
-        globalStartPosition = outerGroup.current.localToWorld(
-          worldPosStart.clone()
-        );
-        const worldPosEnd = new Vector3(...endPosition);
-        globalEndPosition = outerGroup.current.localToWorld(
-          worldPosEnd.clone()
-        );
-      }
-      if (updatedVehicle && globalEndPosition && globalStartPosition) {
-        const event = updateEvent(
-          selectedProduct.productId,
-          selectedEventSphere.userData.modelUuid,
-          {
-            point: {
-              ...updatedVehicle.point,
-              action: {
-                ...updatedVehicle.point?.action,
-                pickUpPoint: {
-                  position: {
-                    x: globalStartPosition.x,
-                    y: 0,
-                    z: globalStartPosition.z,
-                  },
-                  rotation: { x: 0, y: startRotation[1], z: 0 },
-                },
-                unLoadPoint: {
-                  position: {
-                    x: globalEndPosition.x,
-                    y: 0,
-                    z: globalEndPosition.z,
-                  },
-                  rotation: { x: 0, y: endRotation[1], z: 0 },
-                },
-                steeringAngle: steeringRotation[1],
-              },
-            },
-          }
-        );
-
-        if (event) {
-          updateBackend(
-            selectedProduct.productName,
-            selectedProduct.productId,
-            organization,
-            event
-          );
-        }
-      }
-    }
-  };
-
-  useFrame(() => {
-    if (!isDragging || !plane.current || !raycaster || !outerGroup.current)
-      return;
-    const intersectPoint = new Vector3();
-    const intersects = raycaster.ray.intersectPlane(
-      plane.current,
-      intersectPoint
-    );
-    if (!intersects) return;
-    const localPoint = outerGroup?.current.worldToLocal(intersectPoint.clone());
-    if (isDragging === "start") {
-      setStartPosition([localPoint.x, point[1], localPoint.z]);
-    } else if (isDragging === "end") {
-      setEndPosition([localPoint.x, point[1], localPoint.z]);
-    }
-  });
-
-  useEffect(() => {
-    const handleGlobalPointerUp = () => {
-      setIsDragging(null);
-      setIsRotating(null);
-      setTubeRotation(false);
-      if (controls) controls.enabled = true;
-      handlePointerUp();
-    };
-
-    if (isDragging || isRotating || tubeRotation) {
-      window.addEventListener("pointerup", handleGlobalPointerUp);
-    }
-
-    return () => {
-      window.removeEventListener("pointerup", handleGlobalPointerUp);
-    };
-  }, [
-    isDragging,
-    isRotating,
-    startPosition,
-    startRotation,
-    endPosition,
-    endRotation,
-    tubeRotation,
-    steeringRotation,
-    outerGroup.current,
-    tubeRef.current,
-  ]);
-
-  const prevSteeringY = useRef(0);
-  useFrame((state) => {
-    if (tubeRotation) {
-      const currentPointerX = state.pointer.x;
-      const deltaX = currentPointerX - prevMousePos.current.x;
-      prevMousePos.current.x = currentPointerX;
-
-      const marker = tubeRef.current;
-      if (marker) {
-        const rotationSpeed = 2;
-        marker.rotation.y += deltaX * rotationSpeed;
-        setSteeringRotation([
-          marker.rotation.x,
-          marker.rotation.y,
-          marker.rotation.z,
-        ]);
-      }
-    } else {
-      prevSteeringY.current = 0;
-    }
-  });
-  useFrame((state) => {
-    if (!isRotating) return;
-    const currentPointerX = state.pointer.x;
-    const deltaX = currentPointerX - prevMousePos.current.x;
-    prevMousePos.current.x = currentPointerX;
-    const marker =
-      isRotating === "start" ? startMarker.current : endMarker.current;
-    if (marker) {
-      const rotationSpeed = 10;
-      marker.rotation.y += deltaX * rotationSpeed;
-      if (isRotating === "start") {
-        setStartRotation([
-          marker.rotation.x,
-          marker.rotation.y,
-          marker.rotation.z,
-        ]);
-      } else {
-        setEndRotation([
-          marker.rotation.x,
-          marker.rotation.y,
-          marker.rotation.z,
-        ]);
-      }
-    }
-  });
-
-  return selectedVehicleData ? (
-    <group
-      position={selectedVehicleData.position}
-      rotation={selectedVehicleData.rotation}
-      ref={outerGroup}
-    >
-      <group
-        position={[0, 0, 0]}
-        ref={tubeRef}
-        rotation={steeringRotation}
-        onPointerDown={(e) => {
-          e.stopPropagation();
-          setTubeRotation(true);
-          prevMousePos.current.x = e.pointer.x;
-          controls.enabled = false;
-        }}
-        onPointerMissed={() => {
-          controls.enabled = true;
-          setTubeRotation(false);
-        }}
-        onPointerUp={() => {
-          controls.enabled = true;
-          setTubeRotation(false);
-        }}
-      >
-        (
-        <mesh
-          position={[0, point[1], 0]}
-          rotation={[-Math.PI / 2, 0, 0]}
-          name="steering"
+    return selectedVehicleData ? (
+        <group
+            position={selectedVehicleData.position}
+            rotation={selectedVehicleData.rotation}
+            ref={outerGroup}
         >
-          <ringGeometry args={[CIRCLE_RADIUS, CIRCLE_RADIUS + 0.2, 36]} />
-          <meshBasicMaterial color="yellow" side={DoubleSide} />
-        </mesh>
-        <mesh
-          position={[0, point[1], CIRCLE_RADIUS + 0.24]}
-          rotation={[Math.PI / 2, 0, 0]}
-        >
-          <coneGeometry args={[0.1, 0.3, 12]} />
-          <meshBasicMaterial color="yellow" side={DoubleSide} />
-        </mesh>
-        )
-      </group>
+            <group
+                position={[0, 0, 0]}
+                ref={tubeRef}
+                rotation={steeringRotation}
+                onPointerDown={(e) => {
+                    e.stopPropagation();
+                    setTubeRotation(true);
+                    prevMousePos.current.x = e.pointer.x;
+                    controls.enabled = false;
+                }}
+                onPointerMissed={() => {
+                    controls.enabled = true;
+                    setTubeRotation(false);
+                }}
+                onPointerUp={() => {
+                    controls.enabled = true;
+                    setTubeRotation(false);
+                }}
+            >
+                (
+                <mesh
+                    position={[0, point[1], 0]}
+                    rotation={[-Math.PI / 2, 0, 0]}
+                    name="steering"
+                >
+                    <ringGeometry args={[CIRCLE_RADIUS, CIRCLE_RADIUS + 0.2, 36]} />
+                    <meshBasicMaterial color="yellow" side={DoubleSide} />
+                </mesh>
+                <mesh
+                    position={[0, point[1], CIRCLE_RADIUS + 0.24]}
+                    rotation={[Math.PI / 2, 0, 0]}
+                >
+                    <coneGeometry args={[0.1, 0.3, 12]} />
+                    <meshBasicMaterial color="yellow" side={DoubleSide} />
+                </mesh>
+                )
+            </group>
 
-      {/* Start Marker */}
-      <primitive
-        name="startMarker"
-        object={startScene}
-        ref={startMarker}
-        position={startPosition}
-        rotation={startRotation}
-        onPointerDown={(e: any) => {
-          e.stopPropagation();
-          handlePointerDown(e, "start", "start");
-        }}
-        onPointerMissed={() => {
-          controls.enabled = true;
-          setIsDragging(null);
-          setIsRotating(null);
-        }}
-      />
+            {/* Start Marker */}
+            <primitive
+                name="startMarker"
+                object={startScene}
+                ref={startMarker}
+                position={startPosition}
+                rotation={startRotation}
+                onPointerDown={(e: any) => {
+                    e.stopPropagation();
+                    handlePointerDown(e, "start", "start");
+                }}
+                onPointerMissed={() => {
+                    controls.enabled = true;
+                    setIsDragging(null);
+                    setIsRotating(null);
+                }}
+            />
 
-      {/* End Marker */}
-      <primitive
-        name="endMarker"
-        object={endScene}
-        ref={endMarker}
-        position={endPosition}
-        rotation={endRotation}
-        onPointerDown={(e: any) => {
-          e.stopPropagation();
-          handlePointerDown(e, "end", "end");
-        }}
-        onPointerMissed={() => {
-          controls.enabled = true;
-          setIsDragging(null);
-          setIsRotating(null);
-        }}
-      />
-    </group>
-  ) : null;
+            {/* End Marker */}
+            <primitive
+                name="endMarker"
+                object={endScene}
+                ref={endMarker}
+                position={endPosition}
+                rotation={endRotation}
+                onPointerDown={(e: any) => {
+                    e.stopPropagation();
+                    handlePointerDown(e, "end", "end");
+                }}
+                onPointerMissed={() => {
+                    controls.enabled = true;
+                    setIsDragging(null);
+                    setIsRotating(null);
+                }}
+            />
+        </group>
+    ) : null;
 };
 export default VehicleUI;
diff --git a/app/src/modules/simulation/triggers/triggerHandler/useTriggerHandler.ts b/app/src/modules/simulation/triggers/triggerHandler/useTriggerHandler.ts
index e349880..0989b89 100644
--- a/app/src/modules/simulation/triggers/triggerHandler/useTriggerHandler.ts
+++ b/app/src/modules/simulation/triggers/triggerHandler/useTriggerHandler.ts
@@ -27,9 +27,9 @@ export function useTriggerHandler() {
 
     const handleTrigger = (trigger: TriggerSchema, action: Action, materialId?: string) => {
 
-        const fromEvent = getEventByTriggerUuid(selectedProduct.productId, trigger.triggerUuid);
+        const fromEvent = getEventByTriggerUuid(selectedProduct.productUuid, trigger.triggerUuid);
 
-        const toEvent = getEventByModelUuid(selectedProduct.productId, trigger.triggeredAsset?.triggeredModel.modelUuid || '');
+        const toEvent = getEventByModelUuid(selectedProduct.productUuid, trigger.triggeredAsset?.triggeredModel.modelUuid || '');
 
         if (fromEvent?.type === 'transfer') {
             if (toEvent?.type === 'transfer') {
@@ -69,7 +69,7 @@ export function useTriggerHandler() {
                         handleAction(action, materialId);
 
                         if (material.next) {
-                            const action = getActionByUuid(selectedProduct.productId, trigger.triggeredAsset.triggeredAction.actionUuid);
+                            const action = getActionByUuid(selectedProduct.productUuid, trigger.triggeredAsset.triggeredAction.actionUuid);
                             const vehicle = getVehicleById(trigger.triggeredAsset?.triggeredModel.modelUuid);
 
                             setPreviousLocation(material.materialId, {
@@ -123,7 +123,7 @@ export function useTriggerHandler() {
                         handleAction(action, materialId);
 
                         if (material.next) {
-                            const action = getActionByUuid(selectedProduct.productId, trigger.triggeredAsset.triggeredAction.actionUuid);
+                            const action = getActionByUuid(selectedProduct.productUuid, trigger.triggeredAsset.triggeredAction.actionUuid);
                             const armBot = getArmBotById(trigger.triggeredAsset?.triggeredModel.modelUuid);
 
                             setPreviousLocation(material.materialId, {
@@ -147,7 +147,7 @@ export function useTriggerHandler() {
                                         action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid &&
                                         action.triggers[0]?.triggeredAsset?.triggeredAction?.actionUuid &&
                                         action.triggers[0]?.triggeredAsset?.triggeredPoint?.pointUuid) {
-                                        const model = getEventByModelUuid(selectedProduct.productId, action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid);
+                                        const model = getEventByModelUuid(selectedProduct.productUuid, action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid);
 
                                         if (model?.type === 'vehicle') {
                                             const vehicle = getVehicleById(action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid);
@@ -264,7 +264,7 @@ export function useTriggerHandler() {
                 if (materialId && trigger.triggeredAsset && trigger.triggeredAsset.triggeredPoint && trigger.triggeredAsset.triggeredAction) {
                     const material = getMaterialById(materialId);
                     if (material) {
-                        const action = getActionByUuid(selectedProduct.productId, trigger.triggeredAsset.triggeredAction.actionUuid);
+                        const action = getActionByUuid(selectedProduct.productUuid, trigger.triggeredAsset.triggeredAction.actionUuid);
 
                         setPreviousLocation(material.materialId, {
                             modelUuid: material.current.modelUuid,
@@ -306,7 +306,7 @@ export function useTriggerHandler() {
                 if (materialId && trigger.triggeredAsset && trigger.triggeredAsset.triggeredPoint && trigger.triggeredAsset.triggeredAction) {
                     const material = getMaterialById(materialId);
                     if (material) {
-                        const action = getActionByUuid(selectedProduct.productId, trigger.triggeredAsset.triggeredAction.actionUuid);
+                        const action = getActionByUuid(selectedProduct.productUuid, trigger.triggeredAsset.triggeredAction.actionUuid);
                         const armBot = getArmBotById(trigger.triggeredAsset?.triggeredModel.modelUuid);
 
                         setPreviousLocation(material.materialId, {
@@ -346,7 +346,7 @@ export function useTriggerHandler() {
                 if (materialId && trigger.triggeredAsset && trigger.triggeredAsset.triggeredPoint && trigger.triggeredAsset.triggeredAction) {
                     const material = getMaterialById(materialId);
                     if (material) {
-                        const action = getActionByUuid(selectedProduct.productId, trigger.triggeredAsset.triggeredAction.actionUuid);
+                        const action = getActionByUuid(selectedProduct.productUuid, trigger.triggeredAsset.triggeredAction.actionUuid);
                         const storageUnit = getStorageUnitById(trigger.triggeredAsset?.triggeredModel.modelUuid);
 
                         setPreviousLocation(material.materialId, {
@@ -399,7 +399,7 @@ export function useTriggerHandler() {
                     setIsPaused(materialId, true);
 
                     if (material) {
-                        const action = getActionByUuid(selectedProduct.productId, trigger.triggeredAsset.triggeredAction.actionUuid);
+                        const action = getActionByUuid(selectedProduct.productUuid, trigger.triggeredAsset.triggeredAction.actionUuid);
                         const armBot = getArmBotById(trigger.triggeredAsset?.triggeredModel.modelUuid);
 
                         setPreviousLocation(material.materialId, {
@@ -423,11 +423,11 @@ export function useTriggerHandler() {
                             if (armBot.isActive === false && armBot.state === 'idle') {
 
                                 // Handle current action from arm bot
-                                const model = getEventByModelUuid(selectedProduct.productId, action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid || '');
+                                const model = getEventByModelUuid(selectedProduct.productUuid, action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid || '');
                                 if (model?.type === 'transfer') {
                                     const conveyor = getConveyorById(action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid || '');
                                     if (conveyor) {
-                                        const previousModel = getEventByModelUuid(selectedProduct.productId, material.previous?.modelUuid || '');
+                                        const previousModel = getEventByModelUuid(selectedProduct.productUuid, material.previous?.modelUuid || '');
                                         if (previousModel) {
                                             if (previousModel.type === 'transfer' && previousModel.modelUuid === model.modelUuid) {
                                                 handleAction(action, materialId)
@@ -453,11 +453,11 @@ export function useTriggerHandler() {
 
                                 addArmBotToMonitor(armBot.modelUuid,
                                     () => {
-                                        const model = getEventByModelUuid(selectedProduct.productId, action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid || '');
+                                        const model = getEventByModelUuid(selectedProduct.productUuid, action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid || '');
                                         if (model?.type === 'transfer') {
                                             const conveyor = getConveyorById(action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid || '');
                                             if (conveyor) {
-                                                const previousModel = getEventByModelUuid(selectedProduct.productId, material.previous?.modelUuid || '');
+                                                const previousModel = getEventByModelUuid(selectedProduct.productUuid, material.previous?.modelUuid || '');
                                                 if (previousModel) {
                                                     if (previousModel.type === 'transfer' && previousModel.modelUuid === model.modelUuid) {
                                                         handleAction(action, materialId)
@@ -506,20 +506,20 @@ export function useTriggerHandler() {
                             actionUuid: trigger.triggeredAsset?.triggeredAction?.actionUuid,
                         });
 
-                        const action = getActionByUuid(selectedProduct.productId, trigger.triggeredAsset.triggeredAction.actionUuid);
+                        const action = getActionByUuid(selectedProduct.productUuid, trigger.triggeredAsset.triggeredAction.actionUuid);
 
                         if (action && action.triggers.length > 0 &&
                             action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid &&
                             action.triggers[0]?.triggeredAsset?.triggeredAction?.actionUuid &&
                             action.triggers[0]?.triggeredAsset?.triggeredPoint?.pointUuid) {
-                            const model = getEventByModelUuid(selectedProduct.productId, action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid);
+                            const model = getEventByModelUuid(selectedProduct.productUuid, action.triggers[0]?.triggeredAsset?.triggeredModel.modelUuid);
 
                             if (model?.type === 'roboticArm') {
 
                                 handleAction(action, material.materialId);
 
                             } else if (model?.type === 'vehicle') {
-                                const nextAction = getActionByUuid(selectedProduct.productId, action.triggers[0]?.triggeredAsset?.triggeredAction.actionUuid);
+                                const nextAction = getActionByUuid(selectedProduct.productUuid, action.triggers[0]?.triggeredAsset?.triggeredAction.actionUuid);
 
                                 if (action) {
                                     handleAction(action, material.materialId);
@@ -631,7 +631,7 @@ export function useTriggerHandler() {
 
                         setIsPaused(material.materialId, false);
 
-                        const action = getActionByUuid(selectedProduct.productId, trigger.triggeredAsset.triggeredAction.actionUuid);
+                        const action = getActionByUuid(selectedProduct.productUuid, trigger.triggeredAsset.triggeredAction.actionUuid);
                         const vehicle = getVehicleById(trigger.triggeredAsset?.triggeredModel.modelUuid);
 
                         setNextLocation(material.materialId, null);
@@ -679,7 +679,7 @@ export function useTriggerHandler() {
 
                         // setIsPaused(material.materialId, false);
 
-                        const action = getActionByUuid(selectedProduct.productId, trigger.triggeredAsset.triggeredAction.actionUuid);
+                        const action = getActionByUuid(selectedProduct.productUuid, trigger.triggeredAsset.triggeredAction.actionUuid);
                         const machine = getMachineById(trigger.triggeredAsset?.triggeredModel.modelUuid);
                         setNextLocation(material.materialId, null);
 
@@ -724,7 +724,7 @@ export function useTriggerHandler() {
                 if (materialId && trigger.triggeredAsset && trigger.triggeredAsset.triggeredPoint && trigger.triggeredAsset.triggeredAction) {
                     const material = getMaterialById(materialId);
                     if (material) {
-                        const action = getActionByUuid(selectedProduct.productId, trigger.triggeredAsset.triggeredAction.actionUuid);
+                        const action = getActionByUuid(selectedProduct.productUuid, trigger.triggeredAsset.triggeredAction.actionUuid);
                         const storageUnit = getStorageUnitById(trigger.triggeredAsset?.triggeredModel.modelUuid);
 
                         setPreviousLocation(material.materialId, {
@@ -782,9 +782,9 @@ export function useTriggerHandler() {
     const handleFinalAction = (action: Action, materialId?: string) => {
         if (!action) return;
 
-        const modelUuid = getModelUuidByActionUuid(selectedProduct.productId, action.actionUuid);
+        const modelUuid = getModelUuidByActionUuid(selectedProduct.productUuid, action.actionUuid);
         if (!modelUuid) return;
-        const finalModel = getEventByModelUuid(selectedProduct.productId, modelUuid);
+        const finalModel = getEventByModelUuid(selectedProduct.productUuid, modelUuid);
         if (!finalModel) return;
 
         if (finalModel.type === 'transfer') {
diff --git a/app/src/modules/simulation/vehicle/instances/instance/vehicleInstance.tsx b/app/src/modules/simulation/vehicle/instances/instance/vehicleInstance.tsx
index 38d38a8..2031f99 100644
--- a/app/src/modules/simulation/vehicle/instances/instance/vehicleInstance.tsx
+++ b/app/src/modules/simulation/vehicle/instances/instance/vehicleInstance.tsx
@@ -215,24 +215,24 @@ function VehicleInstance({ agvDetail }: Readonly<{ agvDetail: VehicleStatus }>)
 
     function startUnloadingProcess() {
         if (agvDetail.point.action.triggers.length > 0) {
-            const trigger = getTriggerByUuid(selectedProduct.productId, agvDetail.point.action.triggers[0]?.triggerUuid);
-            const model = getEventByModelUuid(selectedProduct.productId, trigger?.triggeredAsset?.triggeredModel?.modelUuid || '');
+            const trigger = getTriggerByUuid(selectedProduct.productUuid, agvDetail.point.action.triggers[0]?.triggerUuid);
+            const model = getEventByModelUuid(selectedProduct.productUuid, trigger?.triggeredAsset?.triggeredModel?.modelUuid || '');
 
             if (trigger && model) {
                 if (model.type === 'transfer') {
-                    const action = getActionByUuid(selectedProduct.productId, agvDetail.point.action.actionUuid);
+                    const action = getActionByUuid(selectedProduct.productUuid, agvDetail.point.action.actionUuid);
                     if (action) {
                         handleMaterialDropToConveyor(model);
                     }
                 } else if (model.type === 'machine') {
                     // 
                 } else if (model.type === 'roboticArm') {
-                    const action = getActionByUuid(selectedProduct.productId, agvDetail.point.action.actionUuid);
+                    const action = getActionByUuid(selectedProduct.productUuid, agvDetail.point.action.actionUuid);
                     if (action) {
                         handleMaterialDropToArmBot(model);
                     }
                 } else if (model.type === 'storageUnit') {
-                    const action = getActionByUuid(selectedProduct.productId, agvDetail.point.action.actionUuid);
+                    const action = getActionByUuid(selectedProduct.productUuid, agvDetail.point.action.actionUuid);
                     if (action) {
                         handleMaterialDropToStorageUnit(model);
                     }
diff --git a/app/src/modules/visualization/widgets/2d/charts/BarGraphComponent.tsx b/app/src/modules/visualization/widgets/2d/charts/BarGraphComponent.tsx
index c5c90a2..7047713 100644
--- a/app/src/modules/visualization/widgets/2d/charts/BarGraphComponent.tsx
+++ b/app/src/modules/visualization/widgets/2d/charts/BarGraphComponent.tsx
@@ -186,9 +186,9 @@ const BarGraphComponent = ({
           `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/data?widgetID=${id}&zoneUuid=${selectedZone.zoneUuid}&projectId=${projectId}`,
           {
             headers: {
-              Authorization: "Bearer <access_token>",  // Replace with actual token
+              Authorization: "Bearer <access_token>",
               "Content-Type": "application/json",
-              token: localStorage.getItem("token") || "",  // Coerce null to empty string
+              token: localStorage.getItem("token") || "",
               refresh_token: localStorage.getItem("refreshToken") || "",
             },
           }
diff --git a/app/src/modules/visualization/widgets/2d/charts/DoughnutGraphComponent.tsx b/app/src/modules/visualization/widgets/2d/charts/DoughnutGraphComponent.tsx
index 07628a8..b322d8f 100644
--- a/app/src/modules/visualization/widgets/2d/charts/DoughnutGraphComponent.tsx
+++ b/app/src/modules/visualization/widgets/2d/charts/DoughnutGraphComponent.tsx
@@ -168,9 +168,9 @@ const DoughnutGraphComponent = ({
           `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/data?widgetID=${id}&zoneUuid=${selectedZone.zoneUuid}&projectId=${projectId}`,
           {
             headers: {
-              Authorization: "Bearer <access_token>",  // Replace with actual token
+              Authorization: "Bearer <access_token>",
               "Content-Type": "application/json",
-              token: localStorage.getItem("token") || "",  // Coerce null to empty string
+              token: localStorage.getItem("token") || "",
               refresh_token: localStorage.getItem("refreshToken") || "",
             },
           }
diff --git a/app/src/modules/visualization/widgets/2d/charts/LineGraphComponent.tsx b/app/src/modules/visualization/widgets/2d/charts/LineGraphComponent.tsx
index 1178b5b..fe1a5de 100644
--- a/app/src/modules/visualization/widgets/2d/charts/LineGraphComponent.tsx
+++ b/app/src/modules/visualization/widgets/2d/charts/LineGraphComponent.tsx
@@ -184,9 +184,9 @@ const LineGraphComponent = ({
           `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/data?widgetID=${id}&zoneUuid=${selectedZone.zoneUuid}&projectId=${projectId}`,
           {
             headers: {
-              Authorization: "Bearer <access_token>",  // Replace with actual token
+              Authorization: "Bearer <access_token>",
               "Content-Type": "application/json",
-              token: localStorage.getItem("token") || "",  // Coerce null to empty string
+              token: localStorage.getItem("token") || "",
               refresh_token: localStorage.getItem("refreshToken") || "",
             },
           }
diff --git a/app/src/modules/visualization/widgets/2d/charts/PieGraphComponent.tsx b/app/src/modules/visualization/widgets/2d/charts/PieGraphComponent.tsx
index b14b7ea..1062b00 100644
--- a/app/src/modules/visualization/widgets/2d/charts/PieGraphComponent.tsx
+++ b/app/src/modules/visualization/widgets/2d/charts/PieGraphComponent.tsx
@@ -183,9 +183,9 @@ const PieChartComponent = ({
           `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/data?widgetID=${id}&zoneUuid=${selectedZone.zoneUuid}&projectId=${projectId}`,
           {
             headers: {
-              Authorization: "Bearer <access_token>",  // Replace with actual token
+              Authorization: "Bearer <access_token>",
               "Content-Type": "application/json",
-              token: localStorage.getItem("token") || "",  // Coerce null to empty string
+              token: localStorage.getItem("token") || "",
               refresh_token: localStorage.getItem("refreshToken") || "",
             },
           }
diff --git a/app/src/modules/visualization/widgets/2d/charts/PolarAreaGraphComponent.tsx b/app/src/modules/visualization/widgets/2d/charts/PolarAreaGraphComponent.tsx
index 425deb0..f581dc5 100644
--- a/app/src/modules/visualization/widgets/2d/charts/PolarAreaGraphComponent.tsx
+++ b/app/src/modules/visualization/widgets/2d/charts/PolarAreaGraphComponent.tsx
@@ -183,9 +183,9 @@ const PolarAreaGraphComponent = ({
           `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/data?widgetID=${id}&zoneUuid=${selectedZone.zoneUuid}&projectId=${projectId}`,
           {
             headers: {
-              Authorization: "Bearer <access_token>",  // Replace with actual token
+              Authorization: "Bearer <access_token>",
               "Content-Type": "application/json",
-              token: localStorage.getItem("token") || "",  // Coerce null to empty string
+              token: localStorage.getItem("token") || "",
               refresh_token: localStorage.getItem("refreshToken") || "",
             },
           }
diff --git a/app/src/modules/visualization/widgets/2d/charts/ProgressCard1.tsx b/app/src/modules/visualization/widgets/2d/charts/ProgressCard1.tsx
index 9b97814..5a908d9 100644
--- a/app/src/modules/visualization/widgets/2d/charts/ProgressCard1.tsx
+++ b/app/src/modules/visualization/widgets/2d/charts/ProgressCard1.tsx
@@ -63,9 +63,9 @@ const ProgressCard1 = ({ id, title }: { id: string; title: string }) => {
           `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/data?widgetID=${id}&zoneUuid=${selectedZone.zoneUuid}&projectId=${projectId}`,
           {
             headers: {
-              Authorization: "Bearer <access_token>",  // Replace with actual token
+              Authorization: "Bearer <access_token>",
               "Content-Type": "application/json",
-              token: localStorage.getItem("token") || "",  // Coerce null to empty string
+              token: localStorage.getItem("token") || "",
               refresh_token: localStorage.getItem("refreshToken") || "",
             },
           }
diff --git a/app/src/modules/visualization/widgets/2d/charts/ProgressCard2.tsx b/app/src/modules/visualization/widgets/2d/charts/ProgressCard2.tsx
index e789b19..15e61a2 100644
--- a/app/src/modules/visualization/widgets/2d/charts/ProgressCard2.tsx
+++ b/app/src/modules/visualization/widgets/2d/charts/ProgressCard2.tsx
@@ -67,9 +67,9 @@ const ProgressCard2 = ({ id, title }: { id: string; title: string }) => {
           `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/data?widgetID=${id}&zoneUuid=${selectedZone.zoneUuid}&projectId=${projectId}`,
           {
             headers: {
-              Authorization: "Bearer <access_token>",  // Replace with actual token
+              Authorization: "Bearer <access_token>",
               "Content-Type": "application/json",
-              token: localStorage.getItem("token") || "",  // Coerce null to empty string
+              token: localStorage.getItem("token") || "",
               refresh_token: localStorage.getItem("refreshToken") || "",
             },
           }
diff --git a/app/src/pages/Project.tsx b/app/src/pages/Project.tsx
index 04f4e87..5ab5d05 100644
--- a/app/src/pages/Project.tsx
+++ b/app/src/pages/Project.tsx
@@ -42,11 +42,10 @@ const Project: React.FC = () => {
   const { setAssets } = useAssetsStore();
   const { setUserName } = useUserName();
   const { setOrganization } = useOrganization();
-  const { selectedFloorItem, setSelectedFloorItem } = useSelectedFloorItem();
   const { setWallItems } = useWallItems();
   const { setZones } = useZones();
   const { isVersionSaved } = useSaveVersion();
-  const { products } = useProductStore();
+  const { setProducts } = useProductStore();
   const { projectId } = useParams();
   const { setProjectName } = useProjectName();
 
@@ -104,6 +103,7 @@ const Project: React.FC = () => {
     setAssets([]);
     setWallItems([]);
     setZones([]);
+    setProducts([]);
     setActiveModule("builder");
     const email = localStorage.getItem("email");
     if (email) {
diff --git a/app/src/services/dashboard/createProject.ts b/app/src/services/dashboard/createProject.ts
index 3677a74..1718086 100644
--- a/app/src/services/dashboard/createProject.ts
+++ b/app/src/services/dashboard/createProject.ts
@@ -6,9 +6,9 @@ export const createProject = async (projectUuid: string, userId: string, thumbna
     const response = await fetch(`${url_Backend_dwinzo}/api/V1/NewProject`, {
       method: "POST",
       headers: {
-        Authorization: "Bearer <access_token>",  // Replace with actual token
+        Authorization: "Bearer <access_token>",
         "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",  // Coerce null to empty string
+        token: localStorage.getItem("token") || "",
         refresh_token: localStorage.getItem("refreshToken") || "",
       },
       body: JSON.stringify({ projectUuid, userId, thumbnail, organization, }),
diff --git a/app/src/services/dashboard/getAllProjects.ts b/app/src/services/dashboard/getAllProjects.ts
index caebc0a..754c270 100644
--- a/app/src/services/dashboard/getAllProjects.ts
+++ b/app/src/services/dashboard/getAllProjects.ts
@@ -7,9 +7,9 @@ export const getAllProjects = async (userId: string, organization: string) => {
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/dashboard/getTrash.ts b/app/src/services/dashboard/getTrash.ts
index acdcad8..052c54a 100644
--- a/app/src/services/dashboard/getTrash.ts
+++ b/app/src/services/dashboard/getTrash.ts
@@ -9,9 +9,9 @@ export const getTrash = async (organization: string) => {
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/dashboard/updateProject.ts b/app/src/services/dashboard/updateProject.ts
index 7bd0f4a..1835895 100644
--- a/app/src/services/dashboard/updateProject.ts
+++ b/app/src/services/dashboard/updateProject.ts
@@ -23,9 +23,9 @@ export const updateProject = async (
       {
         method: "PATCH",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
         body: JSON.stringify(body),
diff --git a/app/src/services/factoryBuilder/assest/floorAsset/getFloorItemsApi.ts b/app/src/services/factoryBuilder/assest/floorAsset/getFloorItemsApi.ts
index d6fbf5c..ac96ba0 100644
--- a/app/src/services/factoryBuilder/assest/floorAsset/getFloorItemsApi.ts
+++ b/app/src/services/factoryBuilder/assest/floorAsset/getFloorItemsApi.ts
@@ -7,9 +7,9 @@ export const getFloorAssets = async (organization: string,projectId?:string) =>
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/factoryBuilder/assest/floorAsset/setFloorItemApi.ts b/app/src/services/factoryBuilder/assest/floorAsset/setFloorItemApi.ts
index d65006c..d9e67e9 100644
--- a/app/src/services/factoryBuilder/assest/floorAsset/setFloorItemApi.ts
+++ b/app/src/services/factoryBuilder/assest/floorAsset/setFloorItemApi.ts
@@ -24,9 +24,9 @@ export const setFloorItemApi = async (
     const response = await fetch(`${url_Backend_dwinzo}/api/V1/setAsset`, {
       method: "POST",
       headers: {
-        Authorization: "Bearer <access_token>",  // Replace with actual token
+        Authorization: "Bearer <access_token>",
         "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",  // Coerce null to empty string
+        token: localStorage.getItem("token") || "",
         refresh_token: localStorage.getItem("refreshToken") || "",
       },
       body: JSON.stringify(body),
diff --git a/app/src/services/factoryBuilder/assest/wallAsset/getWallItemsApi.ts b/app/src/services/factoryBuilder/assest/wallAsset/getWallItemsApi.ts
index bbb149e..096e928 100644
--- a/app/src/services/factoryBuilder/assest/wallAsset/getWallItemsApi.ts
+++ b/app/src/services/factoryBuilder/assest/wallAsset/getWallItemsApi.ts
@@ -7,9 +7,9 @@ export const getWallItems = async (organization: string,projectId?:string) => {
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/factoryBuilder/camera/getCameraApi.ts b/app/src/services/factoryBuilder/camera/getCameraApi.ts
index f7193f2..81d3e71 100644
--- a/app/src/services/factoryBuilder/camera/getCameraApi.ts
+++ b/app/src/services/factoryBuilder/camera/getCameraApi.ts
@@ -7,9 +7,9 @@ export const getCamera = async (organization: string, userId: string, projectId?
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/factoryBuilder/environment/findEnvironment.ts b/app/src/services/factoryBuilder/environment/findEnvironment.ts
index 279f1c6..12c493f 100644
--- a/app/src/services/factoryBuilder/environment/findEnvironment.ts
+++ b/app/src/services/factoryBuilder/environment/findEnvironment.ts
@@ -8,9 +8,9 @@ export const findEnvironment = async (organization: string, userId: string, proj
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/factoryBuilder/environment/setEnvironment.ts b/app/src/services/factoryBuilder/environment/setEnvironment.ts
index 70448d0..063ce23 100644
--- a/app/src/services/factoryBuilder/environment/setEnvironment.ts
+++ b/app/src/services/factoryBuilder/environment/setEnvironment.ts
@@ -17,9 +17,9 @@ export const setEnvironment = async (
       {
         method: "POST",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
         body: JSON.stringify({
diff --git a/app/src/services/factoryBuilder/lines/getLinesApi.ts b/app/src/services/factoryBuilder/lines/getLinesApi.ts
index 9a1475d..4e9ed90 100644
--- a/app/src/services/factoryBuilder/lines/getLinesApi.ts
+++ b/app/src/services/factoryBuilder/lines/getLinesApi.ts
@@ -7,9 +7,9 @@ export const getLines = async (organization: string,projectId?:string) => {
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/factoryBuilder/zones/getZonesApi.ts b/app/src/services/factoryBuilder/zones/getZonesApi.ts
index 2f3882c..34e45e2 100644
--- a/app/src/services/factoryBuilder/zones/getZonesApi.ts
+++ b/app/src/services/factoryBuilder/zones/getZonesApi.ts
@@ -8,9 +8,9 @@ export const getZonesApi = async (organization: string, projectId?: string) => {
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/simulation/products/UpsertProductOrEventApi.ts b/app/src/services/simulation/products/UpsertProductOrEventApi.ts
index 80c99e0..9c8de04 100644
--- a/app/src/services/simulation/products/UpsertProductOrEventApi.ts
+++ b/app/src/services/simulation/products/UpsertProductOrEventApi.ts
@@ -3,11 +3,14 @@ let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_UR
 export const upsertProductOrEventApi = async (body: any) => {
   try {
     const response = await fetch(
-      `${url_Backend_dwinzo}/api/v2/UpsertProductOrEvent`,
+      `${url_Backend_dwinzo}/api/V1/ProductUpsert`,
       {
         method: "POST",
         headers: {
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
+          token: localStorage.getItem("token") || "",
+          refresh_token: localStorage.getItem("refreshToken") || "",
         },
         body: JSON.stringify(body),
       }
diff --git a/app/src/services/simulation/products/deleteEventDataApi.ts b/app/src/services/simulation/products/deleteEventDataApi.ts
index 10448cc..d922563 100644
--- a/app/src/services/simulation/products/deleteEventDataApi.ts
+++ b/app/src/services/simulation/products/deleteEventDataApi.ts
@@ -3,11 +3,14 @@ let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_UR
 export const deleteEventDataApi = async (body: any) => {
   try {
     const response = await fetch(
-      `${url_Backend_dwinzo}/api/v2/EventDataDelete`,
+      `${url_Backend_dwinzo}/api/V1/DeleteEvent`,
       {
         method: "PATCH",
         headers: {
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
+          token: localStorage.getItem("token") || "",
+          refresh_token: localStorage.getItem("refreshToken") || "",
         },
         body: JSON.stringify(body),
       }
diff --git a/app/src/services/simulation/products/deleteProductApi.ts b/app/src/services/simulation/products/deleteProductApi.ts
index d6cc42b..3516894 100644
--- a/app/src/services/simulation/products/deleteProductApi.ts
+++ b/app/src/services/simulation/products/deleteProductApi.ts
@@ -1,17 +1,18 @@
 let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
 
-export const deleteProductApi = async (
-  productId: string,
-  organization: string
-) => {
+export const deleteProductApi = async (body: any) => {
   try {
     const response = await fetch(
-      `${url_Backend_dwinzo}/api/v2/productDataDelete?productId=${productId}&organization=${organization}`,
+      `${url_Backend_dwinzo}/api/V1/DeleteProduct`,
       {
         method: "PATCH",
         headers: {
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
+          token: localStorage.getItem("token") || "",
+          refresh_token: localStorage.getItem("refreshToken") || "",
         },
+        body: JSON.stringify(body),
       }
     );
 
diff --git a/app/src/services/simulation/products/getProductApi.ts b/app/src/services/simulation/products/getProductApi.ts
index 3db4f2b..fe20a2c 100644
--- a/app/src/services/simulation/products/getProductApi.ts
+++ b/app/src/services/simulation/products/getProductApi.ts
@@ -1,16 +1,19 @@
 let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
 
 export const getProductApi = async (
-  productId: string,
-  organization: string
+  productUuid: string,
+  projectId: string
 ) => {
   try {
     const response = await fetch(
-      `${url_Backend_dwinzo}/api/v2/productDatas?productId=${productId}&organization=${organization}`,
+      `${url_Backend_dwinzo}/api/V1/EventsByProduct?productUuid=${productUuid}&projectId=${projectId}`,
       {
         method: "GET",
         headers: {
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
+          token: localStorage.getItem("token") || "",
+          refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
     );
diff --git a/app/src/services/simulation/products/getallProductsApi.ts b/app/src/services/simulation/products/getallProductsApi.ts
index 449dd9a..5e11402 100644
--- a/app/src/services/simulation/products/getallProductsApi.ts
+++ b/app/src/services/simulation/products/getallProductsApi.ts
@@ -1,13 +1,16 @@
 let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
 
-export const getAllProductsApi = async (organization: string) => {
+export const getAllProductsApi = async (projectId: string) => {
   try {
     const response = await fetch(
-      `${url_Backend_dwinzo}/api/v2/AllProducts/${organization}`,
+      `${url_Backend_dwinzo}/api/V1/ProjectProducts/${projectId}`,
       {
         method: "GET",
         headers: {
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
+          token: localStorage.getItem("token") || "",
+          refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
     );
diff --git a/app/src/services/simulation/products/renameProductApi.ts b/app/src/services/simulation/products/renameProductApi.ts
index 56bbf36..673fb35 100644
--- a/app/src/services/simulation/products/renameProductApi.ts
+++ b/app/src/services/simulation/products/renameProductApi.ts
@@ -2,14 +2,17 @@ let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_UR
 
 export const renameProductApi = async (body: {
   productName: string;
-  productId: string;
-  organization: string;
+  productUuid: string;
+  projectId: string;
 }) => {
   try {
-    const response = await fetch(`${url_Backend_dwinzo}/api/v2/productRename`, {
+    const response = await fetch(`${url_Backend_dwinzo}/api/V1/RenameProduct`, {
       method: "PATCH",
       headers: {
+        Authorization: "Bearer <access_token>",
         "Content-Type": "application/json",
+        token: localStorage.getItem("token") || "",
+        refresh_token: localStorage.getItem("refreshToken") || "",
       },
       body: JSON.stringify(body),
     });
@@ -19,6 +22,7 @@ export const renameProductApi = async (body: {
     }
 
     const result = await response.json();
+    console.log('result: ', result);
     return result;
   } catch (error) {
     echo.error("Failed to rename product Api");
diff --git a/app/src/services/visulization/zone/add3dWidget.ts b/app/src/services/visulization/zone/add3dWidget.ts
index 5f97942..141c52a 100644
--- a/app/src/services/visulization/zone/add3dWidget.ts
+++ b/app/src/services/visulization/zone/add3dWidget.ts
@@ -9,9 +9,9 @@ export const adding3dWidgets = async (
     const response = await fetch(`${url_Backend_dwinzo}/api/V1/widget3d/save`, {
       method: "POST",
       headers: {
-        Authorization: "Bearer <access_token>",  // Replace with actual token
+        Authorization: "Bearer <access_token>",
         "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",  // Coerce null to empty string
+        token: localStorage.getItem("token") || "",
         refresh_token: localStorage.getItem("refreshToken") || "",
       },
       body: JSON.stringify({ organization, zoneUuid, widget }),
diff --git a/app/src/services/visulization/zone/addFloatingWidgets.ts b/app/src/services/visulization/zone/addFloatingWidgets.ts
index 1e964ff..20c4852 100644
--- a/app/src/services/visulization/zone/addFloatingWidgets.ts
+++ b/app/src/services/visulization/zone/addFloatingWidgets.ts
@@ -12,9 +12,9 @@ export const addingFloatingWidgets = async (
       {
         method: "POST",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
         body: JSON.stringify({ organization, zoneUuid, widget }),
diff --git a/app/src/services/visulization/zone/addWidgets.ts b/app/src/services/visulization/zone/addWidgets.ts
index db24311..35db302 100644
--- a/app/src/services/visulization/zone/addWidgets.ts
+++ b/app/src/services/visulization/zone/addWidgets.ts
@@ -9,9 +9,9 @@ export const addingWidgets = async (
     const response = await fetch(`${url_Backend_dwinzo}/api/V1/widget/save`, {
       method: "POST",
       headers: {
-        Authorization: "Bearer <access_token>",  // Replace with actual token
+        Authorization: "Bearer <access_token>",
         "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",  // Coerce null to empty string
+        token: localStorage.getItem("token") || "",
         refresh_token: localStorage.getItem("refreshToken") || "",
       },
       body: JSON.stringify({ organization, zoneUuid, widget }),
diff --git a/app/src/services/visulization/zone/clearPanel.ts b/app/src/services/visulization/zone/clearPanel.ts
index a1afd82..d1b5d2e 100644
--- a/app/src/services/visulization/zone/clearPanel.ts
+++ b/app/src/services/visulization/zone/clearPanel.ts
@@ -9,9 +9,9 @@ export const clearPanel = async (
     const response = await fetch(`${url_Backend_dwinzo}/api/V1/panel/clear`, {
       method: "PATCH",
       headers: {
-        Authorization: "Bearer <access_token>",  // Replace with actual token
+        Authorization: "Bearer <access_token>",
         "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",  // Coerce null to empty string
+        token: localStorage.getItem("token") || "",
         refresh_token: localStorage.getItem("refreshToken") || "",
       },
       body: JSON.stringify({ organization, zoneUuid, panelName }),
diff --git a/app/src/services/visulization/zone/delete3dWidget.ts b/app/src/services/visulization/zone/delete3dWidget.ts
index 7613d85..3b18377 100644
--- a/app/src/services/visulization/zone/delete3dWidget.ts
+++ b/app/src/services/visulization/zone/delete3dWidget.ts
@@ -12,9 +12,9 @@ export const delete3dWidgetApi = async (
       {
         method: "PATCH",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
         body: JSON.stringify({ organization, zoneUuid, id }),
diff --git a/app/src/services/visulization/zone/deleteFloatingWidget.ts b/app/src/services/visulization/zone/deleteFloatingWidget.ts
index 0833502..b0ffad7 100644
--- a/app/src/services/visulization/zone/deleteFloatingWidget.ts
+++ b/app/src/services/visulization/zone/deleteFloatingWidget.ts
@@ -11,9 +11,9 @@ export const deleteFloatingWidgetApi = async (
       {
         method: "PATCH",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
         body: JSON.stringify({ organization, floatWidgetID }),
diff --git a/app/src/services/visulization/zone/deletePanel.ts b/app/src/services/visulization/zone/deletePanel.ts
index 51b81c7..a11805b 100644
--- a/app/src/services/visulization/zone/deletePanel.ts
+++ b/app/src/services/visulization/zone/deletePanel.ts
@@ -10,9 +10,9 @@ export const deletePanelApi = async (
     const response = await fetch(`${url_Backend_dwinzo}/api/V1/panel/delete`, {
       method: "PATCH",
       headers: {
-        Authorization: "Bearer <access_token>",  // Replace with actual token
+        Authorization: "Bearer <access_token>",
         "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",  // Coerce null to empty string
+        token: localStorage.getItem("token") || "",
         refresh_token: localStorage.getItem("refreshToken") || "",
       },
       body: JSON.stringify({ organization, zoneUuid, panelName }),
diff --git a/app/src/services/visulization/zone/deleteTemplate.ts b/app/src/services/visulization/zone/deleteTemplate.ts
index a2875b1..c7825f3 100644
--- a/app/src/services/visulization/zone/deleteTemplate.ts
+++ b/app/src/services/visulization/zone/deleteTemplate.ts
@@ -11,9 +11,9 @@ export const deleteTemplateApi = async (
       {
         method: "PATCH",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/visulization/zone/deleteWidgetApi.ts b/app/src/services/visulization/zone/deleteWidgetApi.ts
index ab72e48..8f579de 100644
--- a/app/src/services/visulization/zone/deleteWidgetApi.ts
+++ b/app/src/services/visulization/zone/deleteWidgetApi.ts
@@ -10,9 +10,9 @@ export const deleteWidgetApi = async (
     const response = await fetch(`${url_Backend_dwinzo}/api/V1/widget/delete`, {
       method: "PATCH",
       headers: {
-        Authorization: "Bearer <access_token>",  // Replace with actual token
+        Authorization: "Bearer <access_token>",
         "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",  // Coerce null to empty string
+        token: localStorage.getItem("token") || "",
         refresh_token: localStorage.getItem("refreshToken") || "",
       },
       body: JSON.stringify({ organization, widgetID, zoneUuid }),
diff --git a/app/src/services/visulization/zone/duplicateWidget.ts b/app/src/services/visulization/zone/duplicateWidget.ts
index c5dab34..4a1a370 100644
--- a/app/src/services/visulization/zone/duplicateWidget.ts
+++ b/app/src/services/visulization/zone/duplicateWidget.ts
@@ -9,9 +9,9 @@ export const duplicateWidgetApi = async (
     const response = await fetch(`${url_Backend_dwinzo}/api/V1/widget/save`, {
       method: "POST",
       headers: {
-        Authorization: "Bearer <access_token>",  // Replace with actual token
+        Authorization: "Bearer <access_token>",
         "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",  // Coerce null to empty string
+        token: localStorage.getItem("token") || "",
         refresh_token: localStorage.getItem("refreshToken") || "",
       },
       body: JSON.stringify({ organization, zoneUuid, widget }),
diff --git a/app/src/services/visulization/zone/get3dWidgetData.ts b/app/src/services/visulization/zone/get3dWidgetData.ts
index e591c39..9eb9903 100644
--- a/app/src/services/visulization/zone/get3dWidgetData.ts
+++ b/app/src/services/visulization/zone/get3dWidgetData.ts
@@ -13,9 +13,9 @@ export const get3dWidgetZoneData = async (
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/visulization/zone/getFloatingData.ts b/app/src/services/visulization/zone/getFloatingData.ts
index b91fca1..207e83d 100644
--- a/app/src/services/visulization/zone/getFloatingData.ts
+++ b/app/src/services/visulization/zone/getFloatingData.ts
@@ -11,9 +11,9 @@ export const getFloatingZoneData = async (
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/visulization/zone/getSelect2dZoneData.ts b/app/src/services/visulization/zone/getSelect2dZoneData.ts
index e25c4df..93c2dad 100644
--- a/app/src/services/visulization/zone/getSelect2dZoneData.ts
+++ b/app/src/services/visulization/zone/getSelect2dZoneData.ts
@@ -8,9 +8,9 @@ export const getSelect2dZoneData = async (zoneUuid?: string, organization?: stri
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/visulization/zone/getTemplate.ts b/app/src/services/visulization/zone/getTemplate.ts
index 82d0181..9730260 100644
--- a/app/src/services/visulization/zone/getTemplate.ts
+++ b/app/src/services/visulization/zone/getTemplate.ts
@@ -7,9 +7,9 @@ export const getTemplateData = async (organization?: string, projectId?: string)
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/visulization/zone/getZoneData.ts b/app/src/services/visulization/zone/getZoneData.ts
index a02985e..117007a 100644
--- a/app/src/services/visulization/zone/getZoneData.ts
+++ b/app/src/services/visulization/zone/getZoneData.ts
@@ -7,9 +7,9 @@ export const getZone2dData = async (organization?: string, projectId?: string) =
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/visulization/zone/getZones.ts b/app/src/services/visulization/zone/getZones.ts
index 79164da..65b0ddb 100644
--- a/app/src/services/visulization/zone/getZones.ts
+++ b/app/src/services/visulization/zone/getZones.ts
@@ -8,9 +8,9 @@ export const getZoneData = async (zoneUuid: string, organization: string, projec
       {
         method: "GET",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
       }
diff --git a/app/src/services/visulization/zone/loadTemplate.ts b/app/src/services/visulization/zone/loadTemplate.ts
index adac0bd..fde2eb7 100644
--- a/app/src/services/visulization/zone/loadTemplate.ts
+++ b/app/src/services/visulization/zone/loadTemplate.ts
@@ -11,9 +11,9 @@ export const loadTempleteApi = async (
       {
         method: "POST",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
         body: JSON.stringify({ organization, zoneUuid, templateID }),
diff --git a/app/src/services/visulization/zone/panel.ts b/app/src/services/visulization/zone/panel.ts
index 77276ff..c4f9f6c 100644
--- a/app/src/services/visulization/zone/panel.ts
+++ b/app/src/services/visulization/zone/panel.ts
@@ -10,9 +10,9 @@ export const panelData = async (
     const response = await fetch(`${url_Backend_dwinzo}/api/V1/panel/save`, {
       method: "POST",
       headers: {
-        Authorization: "Bearer <access_token>",  // Replace with actual token
+        Authorization: "Bearer <access_token>",
         "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",  // Coerce null to empty string
+        token: localStorage.getItem("token") || "",
         refresh_token: localStorage.getItem("refreshToken") || "",
       },
       body: JSON.stringify({ organization, zoneUuid, panelOrder }),
diff --git a/app/src/services/visulization/zone/saveTempleteApi.ts b/app/src/services/visulization/zone/saveTempleteApi.ts
index 232fced..61d6395 100644
--- a/app/src/services/visulization/zone/saveTempleteApi.ts
+++ b/app/src/services/visulization/zone/saveTempleteApi.ts
@@ -5,9 +5,9 @@ export const saveTemplateApi = async (organization: string, template: {}) => {
     const response = await fetch(`${url_Backend_dwinzo}/api/V1/template/save`, {
       method: "POST",
       headers: {
-        Authorization: "Bearer <access_token>",  // Replace with actual token
+        Authorization: "Bearer <access_token>",
         "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",  // Coerce null to empty string
+        token: localStorage.getItem("token") || "",
         refresh_token: localStorage.getItem("refreshToken") || "",
       },
       body: JSON.stringify({ organization, template }),
diff --git a/app/src/services/visulization/zone/update3dWidget.ts b/app/src/services/visulization/zone/update3dWidget.ts
index d69e9a2..2c2332e 100644
--- a/app/src/services/visulization/zone/update3dWidget.ts
+++ b/app/src/services/visulization/zone/update3dWidget.ts
@@ -14,9 +14,9 @@ export const update3dWidget = async (
       {
         method: "PATCH",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
         body: JSON.stringify({
@@ -58,9 +58,9 @@ export const update3dWidgetRotation = async (
       {
         method: "PATCH",
         headers: {
-          Authorization: "Bearer <access_token>",  // Replace with actual token
+          Authorization: "Bearer <access_token>",
           "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",  // Coerce null to empty string
+          token: localStorage.getItem("token") || "",
           refresh_token: localStorage.getItem("refreshToken") || "",
         },
         body: JSON.stringify({
diff --git a/app/src/services/visulization/zone/zoneCameraUpdation.ts b/app/src/services/visulization/zone/zoneCameraUpdation.ts
index 9307e42..4c219f5 100644
--- a/app/src/services/visulization/zone/zoneCameraUpdation.ts
+++ b/app/src/services/visulization/zone/zoneCameraUpdation.ts
@@ -6,9 +6,9 @@ export const zoneCameraUpdate = async (zonesdata: {}, organization: string) => {
     const response = await fetch(`${url_Backend_dwinzo}/api/V1/zones`, {
       method: "POST",
      headers: {
-        Authorization: "Bearer <access_token>",  // Replace with actual token
+        Authorization: "Bearer <access_token>",
         "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",  // Coerce null to empty string
+        token: localStorage.getItem("token") || "",
         refresh_token: localStorage.getItem("refreshToken") || "",
       },
       body: JSON.stringify({ zonesdata, organization }),
diff --git a/app/src/store/simulation/useArmBotStore.ts b/app/src/store/simulation/useArmBotStore.ts
index e05ee2b..58efa76 100644
--- a/app/src/store/simulation/useArmBotStore.ts
+++ b/app/src/store/simulation/useArmBotStore.ts
@@ -4,11 +4,11 @@ import { immer } from 'zustand/middleware/immer';
 interface ArmBotStore {
     armBots: ArmBotStatus[];
 
-    addArmBot: (productId: string, event: RoboticArmEventSchema) => void;
+    addArmBot: (productUuid: string, event: RoboticArmEventSchema) => void;
     removeArmBot: (modelUuid: string) => void;
     updateArmBot: (
         modelUuid: string,
-        updates: Partial<Omit<ArmBotStatus, 'modelUuid' | 'productId'>>
+        updates: Partial<Omit<ArmBotStatus, 'modelUuid' | 'productUuid'>>
     ) => void;
     clearArmBots: () => void;
 
@@ -27,7 +27,7 @@ interface ArmBotStore {
     incrementIdleTime: (modelUuid: string, incrementBy: number) => void;
 
     getArmBotById: (modelUuid: string) => ArmBotStatus | undefined;
-    getArmBotsByProduct: (productId: string) => ArmBotStatus[];
+    getArmBotsByProduct: (productUuid: string) => ArmBotStatus[];
     getArmBotsByState: (state: string) => ArmBotStatus[];
     getActiveArmBots: () => ArmBotStatus[];
     getIdleArmBots: () => ArmBotStatus[];
@@ -39,13 +39,13 @@ export const createArmBotStore = () => {
         immer((set, get) => ({
             armBots: [],
 
-            addArmBot: (productId, event) => {
+            addArmBot: (productUuid, event) => {
                 set((state) => {
                     const exists = state.armBots.some(a => a.modelUuid === event.modelUuid);
                     if (!exists) {
                         state.armBots.push({
                             ...event,
-                            productId,
+                            productUuid,
                             isActive: false,
                             idleTime: 0,
                             activeTime: 0,
@@ -184,8 +184,8 @@ export const createArmBotStore = () => {
                 return get().armBots.find(a => a.modelUuid === modelUuid);
             },
 
-            getArmBotsByProduct: (productId) => {
-                return get().armBots.filter(a => a.productId === productId);
+            getArmBotsByProduct: (productUuid) => {
+                return get().armBots.filter(a => a.productUuid === productUuid);
             },
 
             getArmBotsByState: (state) => {
diff --git a/app/src/store/simulation/useConveyorStore.ts b/app/src/store/simulation/useConveyorStore.ts
index 40dfab4..be904e1 100644
--- a/app/src/store/simulation/useConveyorStore.ts
+++ b/app/src/store/simulation/useConveyorStore.ts
@@ -4,11 +4,11 @@ import { immer } from 'zustand/middleware/immer';
 interface ConveyorStore {
     conveyors: ConveyorStatus[];
 
-    addConveyor: (productId: string, event: ConveyorEventSchema) => void;
+    addConveyor: (productUuid: string, event: ConveyorEventSchema) => void;
     removeConveyor: (modelUuid: string) => void;
     updateConveyor: (
         modelUuid: string,
-        updates: Partial<Omit<ConveyorStatus, 'modelUuid' | 'productId'>>
+        updates: Partial<Omit<ConveyorStatus, 'modelUuid' | 'productUuid'>>
     ) => void;
     clearConveyors: () => void;
 
@@ -20,7 +20,7 @@ interface ConveyorStore {
     incrementIdleTime: (modelUuid: string, incrementBy: number) => void;
 
     getConveyorById: (modelUuid: string) => ConveyorStatus | undefined;
-    getConveyorsByProduct: (productId: string) => ConveyorStatus[];
+    getConveyorsByProduct: (productUuid: string) => ConveyorStatus[];
     getConveyorsByState: (state: string) => ConveyorStatus[];
     getActiveConveyors: () => ConveyorStatus[];
     getIdleConveyors: () => ConveyorStatus[];
@@ -31,13 +31,13 @@ export const createConveyorStore = () => {
         immer((set, get) => ({
             conveyors: [],
 
-            addConveyor: (productId, event) => {
+            addConveyor: (productUuid, event) => {
                 set((state) => {
                     const exists = state.conveyors.some(c => c.modelUuid === event.modelUuid);
                     if (!exists) {
                         state.conveyors.push({
                             ...event,
-                            productId,
+                            productUuid,
                             isActive: false,
                             isPaused: false,
                             idleTime: 0,
@@ -118,8 +118,8 @@ export const createConveyorStore = () => {
                 return get().conveyors.find(c => c.modelUuid === modelUuid);
             },
 
-            getConveyorsByProduct: (productId) => {
-                return get().conveyors.filter(c => c.productId === productId);
+            getConveyorsByProduct: (productUuid) => {
+                return get().conveyors.filter(c => c.productUuid === productUuid);
             },
 
             getConveyorsByState: (state) => {
diff --git a/app/src/store/simulation/useMachineStore.ts b/app/src/store/simulation/useMachineStore.ts
index 8fb5b06..505b9c3 100644
--- a/app/src/store/simulation/useMachineStore.ts
+++ b/app/src/store/simulation/useMachineStore.ts
@@ -4,11 +4,11 @@ import { immer } from "zustand/middleware/immer";
 interface MachineStore {
   machines: MachineStatus[];
 
-  addMachine: (productId: string, machine: MachineEventSchema) => void;
+  addMachine: (productUuid: string, machine: MachineEventSchema) => void;
   removeMachine: (modelUuid: string) => void;
   updateMachine: (
     modelUuid: string,
-    updates: Partial<Omit<MachineStatus, "modelUuid" | "productId">>
+    updates: Partial<Omit<MachineStatus, "modelUuid" | "productUuid">>
   ) => void;
   clearMachines: () => void;
 
@@ -31,7 +31,7 @@ interface MachineStore {
   resetTime: (modelUuid: string) => void;
 
   getMachineById: (modelUuid: string) => MachineStatus | undefined;
-  getMachinesByProduct: (productId: string) => MachineStatus[];
+  getMachinesByProduct: (productUuid: string) => MachineStatus[];
   getMachinesBystate: (state: string) => MachineStatus[];
   getActiveMachines: () => MachineStatus[];
   getIdleMachines: () => MachineStatus[];
@@ -42,7 +42,7 @@ export const createMachineStore = () => {
     immer((set, get) => ({
       machines: [],
 
-      addMachine: (productId, machine) => {
+      addMachine: (productUuid, machine) => {
         set((state) => {
           const exists = state.machines.some(
             (m) => m.modelUuid === machine.modelUuid
@@ -50,7 +50,7 @@ export const createMachineStore = () => {
           if (!exists) {
             state.machines.push({
               ...machine,
-              productId,
+              productUuid,
               isActive: false,
               idleTime: 0,
               activeTime: 0,
@@ -158,8 +158,8 @@ export const createMachineStore = () => {
         return get().machines.find((m) => m.modelUuid === modelUuid);
       },
 
-      getMachinesByProduct: (productId) => {
-        return get().machines.filter((m) => m.productId === productId);
+      getMachinesByProduct: (productUuid) => {
+        return get().machines.filter((m) => m.productUuid === productUuid);
       },
 
       getMachinesBystate: (state) => {
diff --git a/app/src/store/simulation/useProductStore.ts b/app/src/store/simulation/useProductStore.ts
index 27b908a..ec80d50 100644
--- a/app/src/store/simulation/useProductStore.ts
+++ b/app/src/store/simulation/useProductStore.ts
@@ -5,22 +5,22 @@ type ProductsStore = {
     products: productsSchema;
 
     // Product-level actions
-    addProduct: (productName: string, productId: string) => void;
+    addProduct: (productName: string, productUuid: string) => void;
     setProducts: (products: productsSchema) => void;
-    removeProduct: (productId: string) => void;
-    updateProduct: (productId: string, updates: Partial<{ productName: string; eventDatas: EventsSchema[] }>) => void;
+    removeProduct: (productUuid: string) => void;
+    updateProduct: (productUuid: string, updates: Partial<{ productName: string; eventDatas: EventsSchema[] }>) => void;
 
     // Event-level actions
-    addEvent: (productId: string, event: EventsSchema) => void;
-    removeEvent: (productId: string, modelUuid: string) => void;
+    addEvent: (productUuid: string, event: EventsSchema) => void;
+    removeEvent: (productUuid: string, modelUuid: string) => void;
     deleteEvent: (modelUuid: string) => void;
-    updateEvent: (productId: string, modelUuid: string, updates: Partial<EventsSchema>) => EventsSchema | undefined;
+    updateEvent: (productUuid: string, modelUuid: string, updates: Partial<EventsSchema>) => EventsSchema | undefined;
 
     // Point-level actions
-    addPoint: (productId: string, modelUuid: string, point: ConveyorPointSchema | VehiclePointSchema | RoboticArmPointSchema | MachinePointSchema | StoragePointSchema) => void;
-    removePoint: (productId: string, modelUuid: string, pointUuid: string) => void;
+    addPoint: (productUuid: string, modelUuid: string, point: ConveyorPointSchema | VehiclePointSchema | RoboticArmPointSchema | MachinePointSchema | StoragePointSchema) => void;
+    removePoint: (productUuid: string, modelUuid: string, pointUuid: string) => void;
     updatePoint: (
-        productId: string,
+        productUuid: string,
         modelUuid: string,
         pointUuid: string,
         updates: Partial<ConveyorPointSchema | VehiclePointSchema | RoboticArmPointSchema | MachinePointSchema | StoragePointSchema>
@@ -28,50 +28,50 @@ type ProductsStore = {
 
     // Action-level actions
     addAction: (
-        productId: string,
+        productUuid: string,
         modelUuid: string,
         pointUuid: string,
         action: ConveyorPointSchema['action'] | VehiclePointSchema['action'] | RoboticArmPointSchema['actions'][0] | MachinePointSchema['action'] | StoragePointSchema['action']
     ) => EventsSchema | undefined;
-    removeAction: (productId: string, actionUuid: string) => EventsSchema | undefined;
+    removeAction: (productUuid: string, actionUuid: string) => EventsSchema | undefined;
     updateAction: (
-        productId: string,
+        productUuid: string,
         actionUuid: string,
         updates: Partial<ConveyorPointSchema['action'] | VehiclePointSchema['action'] | RoboticArmPointSchema['actions'][0] | MachinePointSchema['action'] | StoragePointSchema['action']>
     ) => EventsSchema | undefined;
 
     // Trigger-level actionss
     addTrigger: (
-        productId: string,
+        productUuid: string,
         actionUuid: string,
         trigger: TriggerSchema
     ) => EventsSchema | undefined;
-    removeTrigger: (productId: string, triggerUuid: string) => EventsSchema | undefined;
+    removeTrigger: (productUuid: string, triggerUuid: string) => EventsSchema | undefined;
     updateTrigger: (
-        productId: string,
+        productUuid: string,
         triggerUuid: string,
         updates: Partial<TriggerSchema>
     ) => EventsSchema | undefined;
 
     // Renaming functions
-    renameProduct: (productId: string, newName: string) => void;
-    renameAction: (productId: string, actionUuid: string, newName: string) => EventsSchema | undefined;
-    renameTrigger: (productId: string, triggerUuid: string, newName: string) => EventsSchema | undefined;
+    renameProduct: (productUuid: string, newName: string) => void;
+    renameAction: (productUuid: string, actionUuid: string, newName: string) => EventsSchema | undefined;
+    renameTrigger: (productUuid: string, triggerUuid: string, newName: string) => EventsSchema | undefined;
 
     // Helper functions
-    getProductById: (productId: string) => { productName: string; productId: string; eventDatas: EventsSchema[] } | undefined;
-    getEventByModelUuid: (productId: string, modelUuid: string) => EventsSchema | undefined;
-    getEventByActionUuid: (productId: string, actionUuid: string) => EventsSchema | undefined;
-    getEventByTriggerUuid: (productId: string, triggerUuid: string) => EventsSchema | undefined;
-    getEventByPointUuid: (productId: string, pointUuid: string) => EventsSchema | undefined;
-    getPointByUuid: (productId: string, modelUuid: string, pointUuid: string) => ConveyorPointSchema | VehiclePointSchema | RoboticArmPointSchema | MachinePointSchema | StoragePointSchema | undefined;
-    getActionByUuid: (productId: string, actionUuid: string) => (ConveyorPointSchema['action'] | VehiclePointSchema['action'] | RoboticArmPointSchema['actions'][0] | MachinePointSchema['action'] | StoragePointSchema['action']) | undefined;
-    getActionByPointUuid: (productId: string, pointUuid: string) => (ConveyorPointSchema['action'] | VehiclePointSchema['action'] | RoboticArmPointSchema['actions'][0] | MachinePointSchema['action'] | StoragePointSchema['action']) | undefined;
-    getModelUuidByPointUuid: (productId: string, actionUuid: string) => (string) | undefined;
-    getModelUuidByActionUuid: (productId: string, actionUuid: string) => (string) | undefined;
-    getPointUuidByActionUuid: (productId: string, actionUuid: string) => (string) | undefined;
-    getTriggerByUuid: (productId: string, triggerUuid: string) => TriggerSchema | undefined;
-    getIsEventInProduct: (productId: string, modelUuid: string) => boolean;
+    getProductById: (productUuid: string) => { productName: string; productUuid: string; eventDatas: EventsSchema[] } | undefined;
+    getEventByModelUuid: (productUuid: string, modelUuid: string) => EventsSchema | undefined;
+    getEventByActionUuid: (productUuid: string, actionUuid: string) => EventsSchema | undefined;
+    getEventByTriggerUuid: (productUuid: string, triggerUuid: string) => EventsSchema | undefined;
+    getEventByPointUuid: (productUuid: string, pointUuid: string) => EventsSchema | undefined;
+    getPointByUuid: (productUuid: string, modelUuid: string, pointUuid: string) => ConveyorPointSchema | VehiclePointSchema | RoboticArmPointSchema | MachinePointSchema | StoragePointSchema | undefined;
+    getActionByUuid: (productUuid: string, actionUuid: string) => (ConveyorPointSchema['action'] | VehiclePointSchema['action'] | RoboticArmPointSchema['actions'][0] | MachinePointSchema['action'] | StoragePointSchema['action']) | undefined;
+    getActionByPointUuid: (productUuid: string, pointUuid: string) => (ConveyorPointSchema['action'] | VehiclePointSchema['action'] | RoboticArmPointSchema['actions'][0] | MachinePointSchema['action'] | StoragePointSchema['action']) | undefined;
+    getModelUuidByPointUuid: (productUuid: string, actionUuid: string) => (string) | undefined;
+    getModelUuidByActionUuid: (productUuid: string, actionUuid: string) => (string) | undefined;
+    getPointUuidByActionUuid: (productUuid: string, actionUuid: string) => (string) | undefined;
+    getTriggerByUuid: (productUuid: string, triggerUuid: string) => TriggerSchema | undefined;
+    getIsEventInProduct: (productUuid: string, modelUuid: string) => boolean;
 };
 
 export const useProductStore = create<ProductsStore>()(
@@ -79,13 +79,13 @@ export const useProductStore = create<ProductsStore>()(
         products: [],
 
         // Product-level actions
-        addProduct: (productName, productId) => {
+        addProduct: (productName, productUuid) => {
             set((state) => {
-                const existingProduct = state.products.find(p => p.productId === productId);
+                const existingProduct = state.products.find(p => p.productUuid === productUuid);
                 if (!existingProduct) {
                     const newProduct = {
                         productName,
-                        productId: productId,
+                        productUuid: productUuid,
                         eventDatas: []
                     };
                     state.products.push(newProduct);
@@ -99,15 +99,15 @@ export const useProductStore = create<ProductsStore>()(
             });
         },
 
-        removeProduct: (productId) => {
+        removeProduct: (productUuid) => {
             set((state) => {
-                state.products = state.products.filter(p => p.productId !== productId);
+                state.products = state.products.filter(p => p.productUuid !== productUuid);
             });
         },
 
-        updateProduct: (productId, updates) => {
+        updateProduct: (productUuid, updates) => {
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     Object.assign(product, updates);
                 }
@@ -115,9 +115,9 @@ export const useProductStore = create<ProductsStore>()(
         },
 
         // Event-level actions
-        addEvent: (productId, event) => {
+        addEvent: (productUuid, event) => {
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     const existingEvent = product.eventDatas.find(e => 'modelUuid' in e && e.modelUuid === event.modelUuid);
                     if (!existingEvent) {
@@ -127,9 +127,9 @@ export const useProductStore = create<ProductsStore>()(
             });
         },
 
-        removeEvent: (productId, modelUuid) => {
+        removeEvent: (productUuid, modelUuid) => {
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     product.eventDatas = product.eventDatas.filter(e => 'modelUuid' in e && e.modelUuid !== modelUuid);
                 }
@@ -144,10 +144,10 @@ export const useProductStore = create<ProductsStore>()(
             });
         },
 
-        updateEvent: (productId, modelUuid, updates) => {
+        updateEvent: (productUuid, modelUuid, updates) => {
             let updatedEvent: EventsSchema | undefined;
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     const event = product.eventDatas.find(e => 'modelUuid' in e && e.modelUuid === modelUuid);
                     if (event) {
@@ -160,9 +160,9 @@ export const useProductStore = create<ProductsStore>()(
         },
 
         // Point-level actions
-        addPoint: (productId, modelUuid, point) => {
+        addPoint: (productUuid, modelUuid, point) => {
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     const event = product.eventDatas.find(e => 'modelUuid' in e && e.modelUuid === modelUuid);
                     if (event && 'points' in event) {
@@ -180,9 +180,9 @@ export const useProductStore = create<ProductsStore>()(
             });
         },
 
-        removePoint: (productId, modelUuid, pointUuid) => {
+        removePoint: (productUuid, modelUuid, pointUuid) => {
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     const event = product.eventDatas.find(e => 'modelUuid' in e && e.modelUuid === modelUuid);
                     if (event && 'points' in event) {
@@ -194,10 +194,10 @@ export const useProductStore = create<ProductsStore>()(
             });
         },
 
-        updatePoint: (productId, modelUuid, pointUuid, updates) => {
+        updatePoint: (productUuid, modelUuid, pointUuid, updates) => {
             let updatedEvent: EventsSchema | undefined;
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     const event = product.eventDatas.find(e => 'modelUuid' in e && e.modelUuid === modelUuid);
                     if (event && 'points' in event) {
@@ -216,10 +216,10 @@ export const useProductStore = create<ProductsStore>()(
         },
 
         // Action-level actions
-        addAction: (productId, modelUuid, pointUuid, action) => {
+        addAction: (productUuid, modelUuid, pointUuid, action) => {
             let updatedEvent: EventsSchema | undefined;
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     const event = product.eventDatas.find(e => 'modelUuid' in e && e.modelUuid === modelUuid);
                     if (event && 'points' in event) {
@@ -247,10 +247,10 @@ export const useProductStore = create<ProductsStore>()(
             return updatedEvent;
         },
 
-        removeAction: (productId, actionUuid) => {
+        removeAction: (productUuid, actionUuid) => {
             let updatedEvent: EventsSchema | undefined;
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     for (const event of product.eventDatas) {
                         if ('points' in event) {
@@ -280,10 +280,10 @@ export const useProductStore = create<ProductsStore>()(
             return updatedEvent;
         },
 
-        updateAction: (productId, actionUuid, updates) => {
+        updateAction: (productUuid, actionUuid, updates) => {
             let updatedEvent: EventsSchema | undefined;
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     for (const event of product.eventDatas) {
                         if ('points' in event) {
@@ -316,10 +316,10 @@ export const useProductStore = create<ProductsStore>()(
         },
 
         // Trigger-level actions
-        addTrigger: (productId, actionUuid, trigger) => {
+        addTrigger: (productUuid, actionUuid, trigger) => {
             let updatedEvent: EventsSchema | undefined;
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     for (const event of product.eventDatas) {
                         if ('points' in event) {
@@ -360,10 +360,10 @@ export const useProductStore = create<ProductsStore>()(
             return updatedEvent;
         },
 
-        removeTrigger: (productId, triggerUuid) => {
+        removeTrigger: (productUuid, triggerUuid) => {
             let updatedEvent: EventsSchema | undefined;
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     for (const event of product.eventDatas) {
                         if ('points' in event) {
@@ -402,10 +402,10 @@ export const useProductStore = create<ProductsStore>()(
             return updatedEvent;
         },
 
-        updateTrigger: (productId, triggerUuid, updates) => {
+        updateTrigger: (productUuid, triggerUuid, updates) => {
             let updatedEvent: EventsSchema | undefined;
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     for (const event of product.eventDatas) {
                         if ('points' in event) {
@@ -448,19 +448,19 @@ export const useProductStore = create<ProductsStore>()(
         },
 
         // Renaming functions
-        renameProduct: (productId, newName) => {
+        renameProduct: (productUuid, newName) => {
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     product.productName = newName;
                 }
             });
         },
 
-        renameAction: (productId, actionUuid, newName) => {
+        renameAction: (productUuid, actionUuid, newName) => {
             let updatedEvent: EventsSchema | undefined;
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     for (const event of product.eventDatas) {
                         if ('points' in event) {
@@ -492,10 +492,10 @@ export const useProductStore = create<ProductsStore>()(
             return updatedEvent;
         },
 
-        renameTrigger: (productId, triggerUuid, newName) => {
+        renameTrigger: (productUuid, triggerUuid, newName) => {
             let updatedEvent: EventsSchema | undefined;
             set((state) => {
-                const product = state.products.find(p => p.productId === productId);
+                const product = state.products.find(p => p.productUuid === productUuid);
                 if (product) {
                     for (const event of product.eventDatas) {
                         if ('points' in event) {
@@ -538,18 +538,18 @@ export const useProductStore = create<ProductsStore>()(
         },
 
         // Helper functions
-        getProductById: (productId) => {
-            return get().products.find(p => p.productId === productId);
+        getProductById: (productUuid) => {
+            return get().products.find(p => p.productUuid === productUuid);
         },
 
-        getEventByModelUuid: (productId, modelUuid) => {
-            const product = get().getProductById(productId);
+        getEventByModelUuid: (productUuid, modelUuid) => {
+            const product = get().getProductById(productUuid);
             if (!product) return undefined;
             return product.eventDatas.find(e => 'modelUuid' in e && e.modelUuid === modelUuid);
         },
 
-        getEventByActionUuid: (productId, actionUuid) => {
-            const product = get().getProductById(productId);
+        getEventByActionUuid: (productUuid, actionUuid) => {
+            const product = get().getProductById(productUuid);
             if (!product) return undefined;
 
             for (const event of product.eventDatas) {
@@ -574,8 +574,8 @@ export const useProductStore = create<ProductsStore>()(
             return undefined;
         },
 
-        getEventByTriggerUuid: (productId, triggerUuid) => {
-            const product = get().getProductById(productId);
+        getEventByTriggerUuid: (productUuid, triggerUuid) => {
+            const product = get().getProductById(productUuid);
             if (!product) return undefined;
 
             for (const event of product.eventDatas) {
@@ -603,8 +603,8 @@ export const useProductStore = create<ProductsStore>()(
             return undefined;
         },
 
-        getEventByPointUuid: (productId, pointUuid) => {
-            const product = get().getProductById(productId);
+        getEventByPointUuid: (productUuid, pointUuid) => {
+            const product = get().getProductById(productUuid);
             if (!product) return undefined;
 
             for (const event of product.eventDatas) {
@@ -621,8 +621,8 @@ export const useProductStore = create<ProductsStore>()(
             return undefined;
         },
 
-        getPointByUuid: (productId, modelUuid, pointUuid) => {
-            const event = get().getEventByModelUuid(productId, modelUuid);
+        getPointByUuid: (productUuid, modelUuid, pointUuid) => {
+            const event = get().getEventByModelUuid(productUuid, modelUuid);
             if (!event) return undefined;
 
             if ('points' in event) {
@@ -633,8 +633,8 @@ export const useProductStore = create<ProductsStore>()(
             return undefined;
         },
 
-        getActionByUuid: (productId, actionUuid) => {
-            const product = get().products.find(p => p.productId === productId);
+        getActionByUuid: (productUuid, actionUuid) => {
+            const product = get().products.find(p => p.productUuid === productUuid);
             if (!product) return undefined;
 
             for (const event of product.eventDatas) {
@@ -657,8 +657,8 @@ export const useProductStore = create<ProductsStore>()(
             return undefined;
         },
 
-        getActionByPointUuid: (productId, pointUuid) => {
-            const product = get().products.find(p => p.productId === productId);
+        getActionByPointUuid: (productUuid, pointUuid) => {
+            const product = get().products.find(p => p.productUuid === productUuid);
             if (!product) return undefined;
 
             for (const event of product.eventDatas) {
@@ -678,8 +678,8 @@ export const useProductStore = create<ProductsStore>()(
             return undefined;
         },
 
-        getModelUuidByPointUuid: (productId, pointUuid) => {
-            const product = get().products.find(p => p.productId === productId);
+        getModelUuidByPointUuid: (productUuid, pointUuid) => {
+            const product = get().products.find(p => p.productUuid === productUuid);
             if (!product) return undefined;
 
             for (const event of product.eventDatas) {
@@ -699,8 +699,8 @@ export const useProductStore = create<ProductsStore>()(
             return undefined;
         },
 
-        getModelUuidByActionUuid: (productId, actionUuid) => {
-            const product = get().products.find(p => p.productId === productId);
+        getModelUuidByActionUuid: (productUuid, actionUuid) => {
+            const product = get().products.find(p => p.productUuid === productUuid);
             if (!product) return undefined;
 
             for (const event of product.eventDatas) {
@@ -723,8 +723,8 @@ export const useProductStore = create<ProductsStore>()(
             return undefined;
         },
 
-        getPointUuidByActionUuid: (productId, actionUuid) => {
-            const product = get().products.find(p => p.productId === productId);
+        getPointUuidByActionUuid: (productUuid, actionUuid) => {
+            const product = get().products.find(p => p.productUuid === productUuid);
             if (!product) return undefined;
 
             for (const event of product.eventDatas) {
@@ -747,8 +747,8 @@ export const useProductStore = create<ProductsStore>()(
             return undefined;
         },
 
-        getTriggerByUuid: (productId, triggerUuid) => {
-            const product = get().products.find(p => p.productId === productId);
+        getTriggerByUuid: (productUuid, triggerUuid) => {
+            const product = get().products.find(p => p.productUuid === productUuid);
             if (!product) return undefined;
 
             for (const event of product.eventDatas) {
@@ -782,8 +782,8 @@ export const useProductStore = create<ProductsStore>()(
             return undefined;
         },
 
-        getIsEventInProduct: (productId, modelUuid) => {
-            const product = get().getProductById(productId);
+        getIsEventInProduct: (productUuid, modelUuid) => {
+            const product = get().getProductById(productUuid);
             if (!product) return false;
             return product.eventDatas.some(e => 'modelUuid' in e && e.modelUuid === modelUuid);
         }
diff --git a/app/src/store/simulation/useSimulationStore.ts b/app/src/store/simulation/useSimulationStore.ts
index 9d9df4b..1fad7f6 100644
--- a/app/src/store/simulation/useSimulationStore.ts
+++ b/app/src/store/simulation/useSimulationStore.ts
@@ -69,24 +69,24 @@ export const useSelectedAsset = create<SelectedAssetState>()(
 );
 
 interface SelectedProductState {
-    selectedProduct: { productId: string; productName: string };
-    setSelectedProduct: (productId: string, productName: string) => void;
+    selectedProduct: { productUuid: string; productName: string };
+    setSelectedProduct: (productUuid: string, productName: string) => void;
     clearSelectedProduct: () => void;
 }
 
 export const createSelectedProductStore = () => {
     return create<SelectedProductState>()(
         immer((set) => ({
-            selectedProduct: { productId: '', productName: '' },
-            setSelectedProduct: (productId, productName) => {
+            selectedProduct: { productUuid: '', productName: '' },
+            setSelectedProduct: (productUuid, productName) => {
                 set((state) => {
-                    state.selectedProduct.productId = productId;
+                    state.selectedProduct.productUuid = productUuid;
                     state.selectedProduct.productName = productName;
                 });
             },
             clearSelectedProduct: () => {
                 set((state) => {
-                    state.selectedProduct.productId = '';
+                    state.selectedProduct.productUuid = '';
                     state.selectedProduct.productName = '';
                 });
             },
@@ -153,17 +153,17 @@ export const useIsRotating = create<IsRotatingState>()(
 );
 
 interface MainProductState {
-    mainProduct: { productId: string; productName: string } | null;
-    setMainProduct: (productId: string, productName: string) => void;
+    mainProduct: { productUuid: string; productName: string } | null;
+    setMainProduct: (productUuid: string, productName: string) => void;
     clearMainProduct: () => void;
 }
 
 export const useMainProduct = create<MainProductState>()(
     immer((set) => ({
         mainProduct: null,
-        setMainProduct: (productId: string, productName: string) => {
+        setMainProduct: (productUuid: string, productName: string) => {
             set((state) => {
-                state.mainProduct = { productId, productName };
+                state.mainProduct = { productUuid, productName };
             });
         },
         clearMainProduct: () => {
@@ -175,17 +175,17 @@ export const useMainProduct = create<MainProductState>()(
 );
 
 interface ComparisonProductState {
-    comparisonProduct: { productId: string; productName: string } | null;
-    setComparisonProduct: (productId: string, productName: string) => void;
+    comparisonProduct: { productUuid: string; productName: string } | null;
+    setComparisonProduct: (productUuid: string, productName: string) => void;
     clearComparisonProduct: () => void;
 }
 
 export const useComparisonProduct = create<ComparisonProductState>()(
     immer((set) => ({
         comparisonProduct: null,
-        setComparisonProduct: (productId: string, productName: string) => {
+        setComparisonProduct: (productUuid: string, productName: string) => {
             set((state) => {
-                state.comparisonProduct = { productId, productName };
+                state.comparisonProduct = { productUuid, productName };
             });
         },
         clearComparisonProduct: () => {
diff --git a/app/src/store/simulation/useStorageUnitStore.ts b/app/src/store/simulation/useStorageUnitStore.ts
index a71af3b..c89e643 100644
--- a/app/src/store/simulation/useStorageUnitStore.ts
+++ b/app/src/store/simulation/useStorageUnitStore.ts
@@ -4,11 +4,11 @@ import { immer } from 'zustand/middleware/immer';
 interface StorageUnitStore {
     storageUnits: StorageUnitStatus[];
 
-    addStorageUnit: (productId: string, storageUnit: StorageEventSchema) => void;
+    addStorageUnit: (productUuid: string, storageUnit: StorageEventSchema) => void;
     removeStorageUnit: (modelUuid: string) => void;
     updateStorageUnit: (
         modelUuid: string,
-        updates: Partial<Omit<StorageUnitStatus, 'modelUuid' | 'productId'>>
+        updates: Partial<Omit<StorageUnitStatus, 'modelUuid' | 'productUuid'>>
     ) => void;
     clearStorageUnits: () => void;
 
@@ -27,7 +27,7 @@ interface StorageUnitStore {
     clearCurrentMaterials: (modelUuid: string) => void;
 
     getStorageUnitById: (modelUuid: string) => StorageUnitStatus | undefined;
-    getStorageUnitsByProduct: (productId: string) => StorageUnitStatus[];
+    getStorageUnitsByProduct: (productUuid: string) => StorageUnitStatus[];
     getStorageUnitsBystate: (state: string) => StorageUnitStatus[];
     getActiveStorageUnits: () => StorageUnitStatus[];
     getIdleStorageUnits: () => StorageUnitStatus[];
@@ -40,13 +40,13 @@ export const createStorageUnitStore = () => {
         immer((set, get) => ({
             storageUnits: [],
 
-            addStorageUnit: (productId, storageUnit) => {
+            addStorageUnit: (productUuid, storageUnit) => {
                 set((state) => {
                     const exists = state.storageUnits.some(s => s.modelUuid === storageUnit.modelUuid);
                     if (!exists) {
                         state.storageUnits.push({
                             ...storageUnit,
-                            productId,
+                            productUuid,
                             isActive: false,
                             idleTime: 0,
                             activeTime: 0,
@@ -187,8 +187,8 @@ export const createStorageUnitStore = () => {
                 return get().storageUnits.find(s => s.modelUuid === modelUuid);
             },
 
-            getStorageUnitsByProduct: (productId) => {
-                return get().storageUnits.filter(s => s.productId === productId);
+            getStorageUnitsByProduct: (productUuid) => {
+                return get().storageUnits.filter(s => s.productUuid === productUuid);
             },
 
             getStorageUnitsBystate: (state) => {
diff --git a/app/src/store/simulation/useVehicleStore.ts b/app/src/store/simulation/useVehicleStore.ts
index c41bb7c..90863c4 100644
--- a/app/src/store/simulation/useVehicleStore.ts
+++ b/app/src/store/simulation/useVehicleStore.ts
@@ -4,11 +4,11 @@ import { immer } from "zustand/middleware/immer";
 interface VehiclesStore {
     vehicles: VehicleStatus[];
 
-    addVehicle: (productId: string, event: VehicleEventSchema) => void;
+    addVehicle: (productUuid: string, event: VehicleEventSchema) => void;
     removeVehicle: (modelUuid: string) => void;
     updateVehicle: (
         modelUuid: string,
-        updates: Partial<Omit<VehicleStatus, "modelUuid" | "productId">>
+        updates: Partial<Omit<VehicleStatus, "modelUuid" | "productUuid">>
     ) => void;
     clearvehicles: () => void;
 
@@ -32,7 +32,7 @@ interface VehiclesStore {
     resetTime: (modelUuid: string) => void;
 
     getVehicleById: (modelUuid: string) => VehicleStatus | undefined;
-    getVehiclesByProduct: (productId: string) => VehicleStatus[];
+    getVehiclesByProduct: (productUuid: string) => VehicleStatus[];
     getVehiclesByState: (state: string) => VehicleStatus[];
     getActiveVehicles: () => VehicleStatus[];
 }
@@ -42,13 +42,13 @@ export const createVehicleStore = () => {
         immer((set, get) => ({
             vehicles: [],
 
-            addVehicle: (productId, event) => {
+            addVehicle: (productUuid, event) => {
                 set((state) => {
                     const exists = state.vehicles.some((v) => v.modelUuid === event.modelUuid);
                     if (!exists) {
                         state.vehicles.push({
                             ...event,
-                            productId,
+                            productUuid,
                             isActive: false,
                             isPicking: false,
                             idleTime: 0,
@@ -239,8 +239,8 @@ export const createVehicleStore = () => {
                 return get().vehicles.find((v) => v.modelUuid === modelUuid);
             },
 
-            getVehiclesByProduct: (productId) => {
-                return get().vehicles.filter((v) => v.productId === productId);
+            getVehiclesByProduct: (productUuid) => {
+                return get().vehicles.filter((v) => v.productUuid === productUuid);
             },
 
             getVehiclesByState: (state) => {
diff --git a/app/src/types/simulationTypes.d.ts b/app/src/types/simulationTypes.d.ts
index f93a9d2..d5d2f00 100644
--- a/app/src/types/simulationTypes.d.ts
+++ b/app/src/types/simulationTypes.d.ts
@@ -138,13 +138,13 @@ type EventsSchema = ConveyorEventSchema | VehicleEventSchema | RoboticArmEventSc
 
 type productsSchema = {
     productName: string;
-    productId: string;
+    productUuid: string;
     eventDatas: EventsSchema[];
 }[]
 
 
 interface ConveyorStatus extends ConveyorEventSchema {
-    productId: string;
+    productUuid: string;
     isActive: boolean;
     isPaused: boolean;
     idleTime: number;
@@ -152,7 +152,7 @@ interface ConveyorStatus extends ConveyorEventSchema {
 }
 
 interface MachineStatus extends MachineEventSchema {
-    productId: string;
+    productUuid: string;
     isActive: boolean;
     idleTime: number;
     activeTime: number;
@@ -165,7 +165,7 @@ interface MachineStatus extends MachineEventSchema {
 }
 
 interface ArmBotStatus extends RoboticArmEventSchema {
-    productId: string;
+    productUuid: string;
     isActive: boolean;
     idleTime: number;
     activeTime: number;
@@ -178,7 +178,7 @@ interface ArmBotStatus extends RoboticArmEventSchema {
 }
 
 interface VehicleStatus extends VehicleEventSchema {
-    productId: string;
+    productUuid: string;
     isActive: boolean;
     isPicking: boolean;
     idleTime: number;
@@ -189,7 +189,7 @@ interface VehicleStatus extends VehicleEventSchema {
 }
 
 interface StorageUnitStatus extends StorageEventSchema {
-    productId: string;
+    productUuid: string;
     isActive: boolean;
     idleTime: number;
     activeTime: number;