diff --git a/Classes/x-saherelm.xtrade.class.mq5 b/Classes/x-saherelm.xtrade.class.mq5
index 3f9af293..c95a78b5 100644
--- a/Classes/x-saherelm.xtrade.class.mq5
+++ b/Classes/x-saherelm.xtrade.class.mq5
@@ -5627,7 +5627,15 @@ public:
         // TODO:
         // Here we can apply Same type or Opposit Type
         // Signals behaviour ...
-        // also Implement Signal Filtering ...
+        // also check For Market Open ...
+
+        //
+        // Check Market ...
+        // TODO: Fix this ...
+        // result = mSymbolSession.CanTrade(signal.symbol);
+        // if (!result) {
+        //     return result;
+        // }
 
         //
         return result;
@@ -5801,6 +5809,9 @@ protected:
     bool mSaveTrades;     // Save Trades
     bool mSaveConditions; // Save SL Conditions
 
+    //
+    XSymbolSessionParser mSymbolSession; // Check Symbol Session 
+
     //
     bool mAllowLong;                         // Allow Long/Buy Trade Type
     bool mAllowShort;                        // Allow Short/Sell Trade Type
diff --git a/Experts/x-saherelm.xch.strategy.ea.mq5 b/Experts/x-saherelm.xch.strategy.ea.mq5
index 429fc9a3..8d7a738d 100644
--- a/Experts/x-saherelm.xch.strategy.ea.mq5
+++ b/Experts/x-saherelm.xch.strategy.ea.mq5
@@ -647,6 +647,10 @@ void OnSignalRecieved(
     }
 
     //
+    // Since Signal Filtering done based on
+    // Strategy and it's not related to Public
+    // TradeHandler for Seperation of Concern issue,
+    // we do this here ...
     XCHStartegyConditionsParser parser;
     bool isFiltered = parser.IsFiltered(
         signal,