diff --git a/Projects/Foundations/Schemas/App-Schema/take-position-event.json b/Projects/Foundations/Schemas/App-Schema/take-position-event.json
index e73143628..6d6c2472f 100644
--- a/Projects/Foundations/Schemas/App-Schema/take-position-event.json
+++ b/Projects/Foundations/Schemas/App-Schema/take-position-event.json
@@ -17,6 +17,26 @@
             "relatedUiObjectProject": "Social-Bots",
             "actionProject": "Visual-Scripting"
         },
+        {
+            "action": "Add UI Object",
+            "actionProject": "Visual-Scripting",
+            "disableIfPropertyIsDefined": true,
+            "propertyToCheckFor": "sendSignals",
+            "actionFunction": "payload.executeAction",
+            "label": "Add Send Signals",
+            "relatedUiObject": "Send Signals",
+            "relatedUiObjectProject": "Trading-Signals"
+        },
+        {
+            "action": "Add UI Object",
+            "actionProject": "Visual-Scripting",
+            "disableIfPropertyIsDefined": true,
+            "propertyToCheckFor": "receiveSignals",
+            "actionFunction": "payload.executeAction",
+            "label": "Add Receive Signals",
+            "relatedUiObject": "Receive Signals",
+            "relatedUiObjectProject": "Trading-Signals"
+        },  
         {
             "action": "Delete UI Object",
             "actionProject": "Visual-Scripting",
@@ -45,6 +65,18 @@
             "type": "array",
             "childType": "Announcement",
             "project": "Social-Bots"
+        },
+        {
+            "name": "sendSignals",
+            "type": "node",
+            "childType": "Send Signals",
+            "project": "Trading-Signals"
+        },
+        {
+            "name": "receiveSignals",
+            "type": "node",
+            "childType": "Receive Signals",
+            "project": "Trading-Signals"
         }
     ],
     "propertyNameAtParent": "takePosition"
diff --git a/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json b/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json
index d8f19e01d..57977f828 100644
--- a/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json
+++ b/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json
@@ -17,6 +17,26 @@
             "relatedUiObjectProject": "Social-Bots",
             "actionProject": "Visual-Scripting"
         },
+        {
+            "action": "Add UI Object",
+            "actionProject": "Visual-Scripting",
+            "disableIfPropertyIsDefined": true,
+            "propertyToCheckFor": "sendSignals",
+            "actionFunction": "payload.executeAction",
+            "label": "Add Send Signals",
+            "relatedUiObject": "Send Signals",
+            "relatedUiObjectProject": "Trading-Signals"
+        },
+        {
+            "action": "Add UI Object",
+            "actionProject": "Visual-Scripting",
+            "disableIfPropertyIsDefined": true,
+            "propertyToCheckFor": "receiveSignals",
+            "actionFunction": "payload.executeAction",
+            "label": "Add Receive Signals",
+            "relatedUiObject": "Receive Signals",
+            "relatedUiObjectProject": "Trading-Signals"
+        },  
         {
             "action": "Delete UI Object",
             "actionProject": "Visual-Scripting",
@@ -45,6 +65,18 @@
             "type": "array",
             "childType": "Announcement",
             "project": "Social-Bots"
+        },
+        {
+            "name": "sendSignals",
+            "type": "node",
+            "childType": "Send Signals",
+            "project": "Trading-Signals"
+        },
+        {
+            "name": "receiveSignals",
+            "type": "node",
+            "childType": "Receive Signals",
+            "project": "Trading-Signals"
         }
     ],
     "propertyNameAtParent": "triggerOff"
diff --git a/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json b/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json
index 6d7876cd7..270ab9c48 100644
--- a/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json
+++ b/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json
@@ -17,6 +17,26 @@
             "relatedUiObjectProject": "Social-Bots",
             "actionProject": "Visual-Scripting"
         },
+        {
+            "action": "Add UI Object",
+            "actionProject": "Visual-Scripting",
+            "disableIfPropertyIsDefined": true,
+            "propertyToCheckFor": "sendSignals",
+            "actionFunction": "payload.executeAction",
+            "label": "Add Send Signals",
+            "relatedUiObject": "Send Signals",
+            "relatedUiObjectProject": "Trading-Signals"
+        },
+        {
+            "action": "Add UI Object",
+            "actionProject": "Visual-Scripting",
+            "disableIfPropertyIsDefined": true,
+            "propertyToCheckFor": "receiveSignals",
+            "actionFunction": "payload.executeAction",
+            "label": "Add Receive Signals",
+            "relatedUiObject": "Receive Signals",
+            "relatedUiObjectProject": "Trading-Signals"
+        },        
         {
             "action": "Delete UI Object",
             "actionProject": "Visual-Scripting",
@@ -45,6 +65,18 @@
             "type": "array",
             "childType": "Announcement",
             "project": "Social-Bots"
+        },
+        {
+            "name": "sendSignals",
+            "type": "node",
+            "childType": "Send Signals",
+            "project": "Trading-Signals"
+        },
+        {
+            "name": "receiveSignals",
+            "type": "node",
+            "childType": "Receive Signals",
+            "project": "Trading-Signals"
         }
     ],
     "propertyNameAtParent": "triggerOn"
diff --git a/Projects/Trading-Signals/Icons/receive-signals.png b/Projects/Trading-Signals/Icons/receive-signals.png
new file mode 100644
index 000000000..a4ee2a209
Binary files /dev/null and b/Projects/Trading-Signals/Icons/receive-signals.png differ
diff --git a/Projects/Trading-Signals/Icons/send-signals.png b/Projects/Trading-Signals/Icons/send-signals.png
new file mode 100644
index 000000000..a4ee2a209
Binary files /dev/null and b/Projects/Trading-Signals/Icons/send-signals.png differ
diff --git a/Projects/Trading-Signals/Icons/signal-reference.png b/Projects/Trading-Signals/Icons/signal-reference.png
new file mode 100644
index 000000000..a4ee2a209
Binary files /dev/null and b/Projects/Trading-Signals/Icons/signal-reference.png differ
diff --git a/Projects/Trading-Signals/Schemas/App-Schema/receive-signals.json b/Projects/Trading-Signals/Schemas/App-Schema/receive-signals.json
new file mode 100644
index 000000000..788124a5e
--- /dev/null
+++ b/Projects/Trading-Signals/Schemas/App-Schema/receive-signals.json
@@ -0,0 +1,37 @@
+{
+    "type": "Receive Signals",
+    "menuItems": [
+        {
+            "action": "Add UI Object",
+            "label": "Add Signal Reference",
+            "relatedUiObject": "Signal Reference",
+            "actionFunction": "payload.executeAction",
+            "relatedUiObjectProject": "Trading-Signals",
+            "actionProject": "Visual-Scripting"
+        },
+        {
+            "action": "Delete UI Object",
+            "actionProject": "Visual-Scripting",
+            "askConfirmation": true,
+            "confirmationLabel": "Confirm to Delete",
+            "label": "Delete",
+            "iconPathOn": "delete-entity",
+            "iconPathOff": "delete-entity",
+            "actionFunction": "payload.executeAction"
+        }
+    ],
+    "addLeftIcons": true,
+    "level": 2,
+    "attachingRules": {
+        "compatibleTypes": "->Trigger Off Event->"
+    },
+    "childrenNodesProperties": [
+        {
+            "name": "signalReferences",
+            "type": "array",
+            "childType": "Signal Reference",
+            "autoAdd": false
+        }
+    ],
+    "propertyNameAtParent": "receiveSignals"
+}
\ No newline at end of file
diff --git a/Projects/Trading-Signals/Schemas/App-Schema/send-signals.json b/Projects/Trading-Signals/Schemas/App-Schema/send-signals.json
new file mode 100644
index 000000000..246f118d0
--- /dev/null
+++ b/Projects/Trading-Signals/Schemas/App-Schema/send-signals.json
@@ -0,0 +1,37 @@
+{
+    "type": "Send Signals",
+    "menuItems": [
+        {
+            "action": "Add UI Object",
+            "label": "Add Signal Reference",
+            "relatedUiObject": "Signal Reference",
+            "actionFunction": "payload.executeAction",
+            "relatedUiObjectProject": "Trading-Signals",
+            "actionProject": "Visual-Scripting"
+        },
+        {
+            "action": "Delete UI Object",
+            "actionProject": "Visual-Scripting",
+            "askConfirmation": true,
+            "confirmationLabel": "Confirm to Delete",
+            "label": "Delete",
+            "iconPathOn": "delete-entity",
+            "iconPathOff": "delete-entity",
+            "actionFunction": "payload.executeAction"
+        }
+    ],
+    "addLeftIcons": true,
+    "level": 2,
+    "attachingRules": {
+        "compatibleTypes": "->Trigger On Event->"
+    },
+    "childrenNodesProperties": [
+        {
+            "name": "signalReferences",
+            "type": "array",
+            "childType": "Signal Reference",
+            "autoAdd": false
+        }
+    ],
+    "propertyNameAtParent": "sendSignals"
+}
\ No newline at end of file
diff --git a/Projects/Trading-Signals/Schemas/App-Schema/signal-reference.json b/Projects/Trading-Signals/Schemas/App-Schema/signal-reference.json
new file mode 100644
index 000000000..819bffe59
--- /dev/null
+++ b/Projects/Trading-Signals/Schemas/App-Schema/signal-reference.json
@@ -0,0 +1,40 @@
+{
+    "type": "Signal Reference",
+    "menuItems": [
+        {
+            "action": "Configure",
+            "label": "Configure",
+            "iconPathOn": "configuration",
+            "iconPathOff": "configuration",
+            "dontShowAtFullscreen": true,
+            "actionFunction": "uiObject.configEditor.activate"
+        },
+        {
+            "action": "Delete UI Object",
+            "actionProject": "Visual-Scripting",
+            "askConfirmation": true,
+            "confirmationLabel": "Confirm to Delete",
+            "label": "Delete",
+            "iconPathOn": "delete-entity",
+            "iconPathOff": "delete-entity",
+            "actionFunction": "payload.executeAction"
+        }
+    ],
+    "editors": {
+        "config": true
+    },
+    "initialValues": {
+        "config": "{ \n\"codeName\": \"\"\n}"
+    },
+    "addLeftIcons": true,
+    "level": 2,
+    "referencingRules": {
+        "compatibleTypes": "->Trigger On Signal->Trigger Off Signal->Take Position Signal->Create Order Signal->Cancel Order Signal->"
+    },
+    "childrenNodesProperties": [],
+    "propertyNameAtParent": "signalReferences",
+    "title": [
+        "Use Reference Parent Parent",
+        "Use Reference Parent"
+    ]
+}
\ No newline at end of file