diff --git a/Projects/Social-Trading/NT/Modules/Signal.js b/Projects/Social-Trading/NT/Modules/Signal.js
index 1e9dbc537..80278e153 100644
--- a/Projects/Social-Trading/NT/Modules/Signal.js
+++ b/Projects/Social-Trading/NT/Modules/Signal.js
@@ -128,8 +128,10 @@ exports.newSocialTradingModulesSignal = function newSocialTradingModulesSignal()
                     thisObject.targetBotProfileId,
                     thisObject.emitterPostHash,
                     thisObject.targetPostHash,
-                    thisObject.signalType - 20,
-                    thisObject.timestamp
+                    SA.projects.socialTrading.globals.postTypes.SIGNAL_POST,
+                    thisObject.timestamp,
+                    thisObject.signalType,
+                    thisObject.signalData
                 )
                 return true
             }
diff --git a/Projects/Social-Trading/SA/Globals/PostTypes.js b/Projects/Social-Trading/SA/Globals/PostTypes.js
index 19135688d..8146c04c3 100644
--- a/Projects/Social-Trading/SA/Globals/PostTypes.js
+++ b/Projects/Social-Trading/SA/Globals/PostTypes.js
@@ -4,8 +4,9 @@ exports.newSocialTradingGlobalsPostTypes = function () {
         /* Post Types */
         NEW_POST: 0,
         REPLY_TO_POST: 1,
-        REPOST_: 2,
-        QUOTE_REPOST_: 3
+        REPOST: 2,
+        QUOTE_REPOST: 3,
+        SIGNAL_POST: 4
     }
 
     return thisObject
diff --git a/Projects/Social-Trading/SA/Modules/Social-Graph/BotProfile.js b/Projects/Social-Trading/SA/Modules/Social-Graph/BotProfile.js
index 886bcd53d..eee366470 100644
--- a/Projects/Social-Trading/SA/Modules/Social-Graph/BotProfile.js
+++ b/Projects/Social-Trading/SA/Modules/Social-Graph/BotProfile.js
@@ -75,7 +75,9 @@ exports.newSocialTradingModulesSocialGraphBotProfile = function newSocialTrading
         emitterPostHash,
         targetPostHash,
         postType,
-        timestamp
+        timestamp,
+        signalType,
+        signalData
     ) {
         if (thisObject.posts.get(emitterPostHash) !== undefined) {
             throw ('Post Already Exists.')
@@ -89,7 +91,9 @@ exports.newSocialTradingModulesSocialGraphBotProfile = function newSocialTrading
                 emitterPostHash,
                 targetPostHash,
                 postType,
-                timestamp
+                timestamp,
+                signalType,
+                signalData
             )
 
             thisObject.posts.set(emitterPostHash, post)
diff --git a/Projects/Social-Trading/SA/Modules/Social-Graph/Post.js b/Projects/Social-Trading/SA/Modules/Social-Graph/Post.js
index eac354289..ecd515087 100644
--- a/Projects/Social-Trading/SA/Modules/Social-Graph/Post.js
+++ b/Projects/Social-Trading/SA/Modules/Social-Graph/Post.js
@@ -23,6 +23,9 @@ exports.newSocialTradingModulesSocialGraphPost = function newSocialTradingModule
         /* Post Unique Properties */
         postType: undefined,
         timestamp: undefined,
+        /* Signal Related Properties */
+        signalType: undefined,
+        signalData: undefined,        
         /* Maps */
         replies: undefined,
         reactions: undefined,
@@ -60,7 +63,9 @@ exports.newSocialTradingModulesSocialGraphPost = function newSocialTradingModule
         emitterPostHash,
         targetPostHash,
         postType,
-        timestamp
+        timestamp,
+        signalType,
+        signalData
     ) {
 
         thisObject.emitterUserProfileId = emitterUserProfileId
@@ -71,13 +76,15 @@ exports.newSocialTradingModulesSocialGraphPost = function newSocialTradingModule
         thisObject.targetPostHash = targetPostHash
         thisObject.postType = postType
         thisObject.timestamp = timestamp
+        thisObject.signalType = signalType
+        thisObject.signalData = signalData        
         /*
         Let's find the Target Post
         */
         if (
             thisObject.postType === SA.projects.socialTrading.globals.postTypes.REPLY_TO_POST ||
-            thisObject.postType === SA.projects.socialTrading.globals.postTypes.REPOST_ ||
-            thisObject.postType === SA.projects.socialTrading.globals.postTypes.QUOTE_REPOST_
+            thisObject.postType === SA.projects.socialTrading.globals.postTypes.REPOST ||
+            thisObject.postType === SA.projects.socialTrading.globals.postTypes.QUOTE_REPOST
         ) {
             /*
             Validate Target User Profile.