diff --git a/Classes/x-saherelm.x-trade-manager.class.mq5 b/Classes/x-saherelm.x-trade-manager.class.mq5
index 222a2046..4cb32a6c 100644
--- a/Classes/x-saherelm.x-trade-manager.class.mq5
+++ b/Classes/x-saherelm.x-trade-manager.class.mq5
@@ -24,6 +24,7 @@
 #include "../Classes/x-saherelm.x-alert.class.mq5"
 #include "../Classes/x-saherelm.x-data.collector.class.mq5"
 #include "../Classes/x-saherelm.x-guard.class.mq5"
+#include "../Classes/x-saherelm.x-target.class.mq5"
 #include "../Classes/x-saherelm.x-poi.drawer.class.mq5"
 #include "../Classes/x-saherelm.x-trade.class.mq5"
 #include "../Classes/x-saherelm.x-volume.class.mq5"
diff --git a/Experts/x-saherelm.xom1.ea.mq5 b/Experts/x-saherelm.xom1.ea.mq5
index e8b759ea..e4e3f244 100644
--- a/Experts/x-saherelm.xom1.ea.mq5
+++ b/Experts/x-saherelm.xom1.ea.mq5
@@ -214,7 +214,7 @@ int OnInit()
     //
     // Attach Event Handlers ...
     eaExpert.AddOnSignalEventHandler(OnSignalTriggered);
-    eaExpert.onGuardedEventHandler = OnGuardedTriggered; 
+    eaExpert.onGuardedEventHandler = OnGuardedTriggered;
     eaExpert.AddOnDealsChangedEventHandler(OnDealsChanged);
     eaExpert.AddOnStopLossEventHandler(OnStopLossTriggered);
     eaExpert.AddOnOrdersChangedEventHandler(OnOrdersChanged);
@@ -327,12 +327,17 @@ bool CanAnalyseEventTriggered(
 
 /**
  * Check For Guard Event Handler ...
- * 
+ *
  * @param  guards: XGuard[]
- * 
+ *
  * @return ( int )
  */
-int CheckForGuardTriggered(XGuard &guards[]) {
+int CheckForGuardTriggered(
+    XGuard &guards[],
+    XPosition &positions[],
+    int barIndex = 0 //
+)
+{
     return eaExpert.CheckForGuardTriggered(guards);
 }
 
diff --git a/XOM1EA/Classes/xom1ea.expert.class.mq5 b/XOM1EA/Classes/xom1ea.expert.class.mq5
index dcb08288..75966de2 100644
--- a/XOM1EA/Classes/xom1ea.expert.class.mq5
+++ b/XOM1EA/Classes/xom1ea.expert.class.mq5
@@ -25,6 +25,7 @@
 #include "../../Classes/x-saherelm.base.class.mq5"
 #include "../../Classes/x-saherelm.x-alert.class.mq5"
 #include "../../Classes/x-saherelm.x-guard.class.mq5"
+#include "../../Classes/x-saherelm.x-target.class.mq5"
 #include "../../Classes/x-saherelm.x-trade-manager.class.mq5"
 #include "../../Classes/x-saherelm.x-volume.class.mq5"
 #include "../Classes/xom1ea.signaller.class.mq5"
@@ -107,8 +108,9 @@ class XCXOM1EAExpert : public XCBase
     XCVolume *eaVolume;             // EA Scope Voluem Handler ...
     XCGuard *eaGuard;               // EA Scope Guard Handler ...
     XCTrade *eaTrade;               // EA Scope Trade Handler ...
-    XCTradeManager *eaTradeManager; // EA Scope Trade Handler ...
+    XCTarget *eaTarget;             // EA Scope Target Handler ...
     XTimeTracker eaTimeTracker;     // EA Scope Time Tracker ...
+    XCTradeManager *eaTradeManager; // EA Scope Trade Handler ...
 
     //
     // Tools / Actions / Handlers ...
@@ -514,7 +516,8 @@ class XCXOM1EAExpert : public XCBase
             eaAlert,
             eaTrade,
             eaVolume,
-            eaGuard //
+            eaGuard,
+            eaTarget //
         );
 
         //