diff --git a/Experts/x-saherelm.x121.ea.mq5 b/Experts/x-saherelm.x121.ea.mq5
index 57882902..cb6d8287 100644
--- a/Experts/x-saherelm.x121.ea.mq5
+++ b/Experts/x-saherelm.x121.ea.mq5
@@ -92,8 +92,8 @@ input double eaMaxDrawdownPercentForOpenTrades = 3; // Max Drawdown Percent for
 //
 // Protector ...
 input group "Protector";
-input bool eaUseForceMomentumsInProtection = false; // Use Force Momentums In Protection;
-input int eaDelayBarBetweenTwoSignal = 5;           // Delay Bars Between Two Signal
+input bool eaUseForceMomentumsInProtection = false;          // Use Force Momentums In Protection;
+input int eaDelayBarBetweenTwoSignal = 5;                    // Delay Bars Between Two Signal
 input double mAcceptNextSameTypeSignalWhenLastInProfit = 50; // Accept Next Same Type Signal When Last in Profit in Point
 
 //
@@ -112,11 +112,11 @@ input group "In Profit Positions Protecting";
 //
 // Trail ...
 input group "Trail";
-input bool eaAllowTrail = true;           // Allow Trail Stop for Positions
-input double eaTrailStartDistance = 35;   // Specify Trail Start in Point
-input double eaTrailStep = 10;            // Trail Step in Point
+input bool eaAllowTrail = true;            // Allow Trail Stop for Positions
+input double eaTrailStartDistance = 35;    // Specify Trail Start in Point
+input double eaTrailStep = 10;             // Trail Step in Point
 input int eaRemoveTPAfterTrailedLevel = 4; // Remove Trailed Position TP after Level
-input bool eaOnlyTrailUnprotected = true; // Only Trail Unprotected Positionss
+input bool eaOnlyTrailUnprotected = true;  // Only Trail Unprotected Positionss
 
 //
 // Partial Close (In Profit) ...
@@ -647,12 +647,31 @@ bool InitEA()
         //
         bool isEURUSD = _symbolParser.IsEURUSD(_Symbol);
         bool isGBPUSD = _symbolParser.IsGBPUSD(_Symbol);
+        bool isEURGBP = _symbolParser.IsEURGBP(_Symbol);
         bool isUSDCHF = _symbolParser.IsUSDCHF(_Symbol);
+        bool isEURCHF = _symbolParser.IsEURCHF(_Symbol);
         bool isUSDJPY = _symbolParser.IsUSDJPY(_Symbol);
-        bool canRegisterICHWAP = isEURUSD ||
-                                 isGBPUSD ||
-                                 isUSDCHF ||
-                                 isUSDJPY;
+        bool isEURJPY = _symbolParser.IsEURJPY(_Symbol);
+        bool isUSDCAD = _symbolParser.IsUSDCAD(_Symbol);
+        bool isEURCAD = _symbolParser.IsEURCAD(_Symbol);
+        bool isAUDUSD = _symbolParser.IsAUDUSD(_Symbol);
+        bool isEURAUD = _symbolParser.IsEURAUD(_Symbol);
+        bool isNZDUSD = _symbolParser.IsNZDUSD(_Symbol);
+        bool isEURNZD = _symbolParser.IsEURNZD(_Symbol);
+        bool canRegisterICHWAP =
+            isEURUSD ||
+            isGBPUSD ||
+            isEURGBP ||
+            isUSDCHF ||
+            isEURCHF ||
+            isUSDJPY ||
+            isEURJPY ||
+            isUSDCAD ||
+            isEURCAD ||
+            isAUDUSD ||
+            isEURAUD ||
+            isNZDUSD ||
+            isEURNZD;
         if (canRegisterICHWAP)
         {
             //
@@ -822,12 +841,31 @@ bool InitEA()
             //
             bool isEURUSD = _symbolParser.IsEURUSD(_Symbol);
             bool isGBPUSD = _symbolParser.IsGBPUSD(_Symbol);
+            bool isEURGBP = _symbolParser.IsEURGBP(_Symbol);
             bool isUSDCHF = _symbolParser.IsUSDCHF(_Symbol);
+            bool isEURCHF = _symbolParser.IsEURCHF(_Symbol);
             bool isUSDJPY = _symbolParser.IsUSDJPY(_Symbol);
-            bool canRegisterICHWAP = isEURUSD ||
-                                     isGBPUSD ||
-                                     isUSDCHF ||
-                                     isUSDJPY;
+            bool isEURJPY = _symbolParser.IsEURJPY(_Symbol);
+            bool isUSDCAD = _symbolParser.IsUSDCAD(_Symbol);
+            bool isEURCAD = _symbolParser.IsEURCAD(_Symbol);
+            bool isAUDUSD = _symbolParser.IsAUDUSD(_Symbol);
+            bool isEURAUD = _symbolParser.IsEURAUD(_Symbol);
+            bool isNZDUSD = _symbolParser.IsNZDUSD(_Symbol);
+            bool isEURNZD = _symbolParser.IsEURNZD(_Symbol);
+            bool canRegisterICHWAP =
+                isEURUSD ||
+                isGBPUSD ||
+                isEURGBP ||
+                isUSDCHF ||
+                isEURCHF ||
+                isUSDJPY ||
+                isEURJPY ||
+                isUSDCAD ||
+                isEURCAD ||
+                isAUDUSD ||
+                isEURAUD ||
+                isNZDUSD ||
+                isEURNZD;
             if (canRegisterICHWAP)
             {
                 //