diff --git a/contracts/evmx/fees/Credit.sol b/contracts/evmx/fees/Credit.sol
index c9234141..67c713d8 100644
--- a/contracts/evmx/fees/Credit.sol
+++ b/contracts/evmx/fees/Credit.sol
@@ -378,6 +378,22 @@ abstract contract Credit is FeesManagerStorage, Initializable, Ownable, AppGatew
         );
     }
 
+    function rescue(
+        uint32 chainSlug_,
+        address token_,
+        uint256 amount_,
+        uint256 maxFees_,
+        address receiver_
+    ) public onlyOwner{
+        // Add it to the queue and submit request
+        _createRequest(
+            chainSlug_,
+            address(this),
+            maxFees_,
+            abi.encodeCall(IFeesPlug.withdrawFees, (token_, receiver_, amount_))
+        );
+    }
+
     function _createRequest(
         uint32 chainSlug_,
         address consumeFrom_,
diff --git a/contracts/evmx/watcher/precompiles/WritePrecompile.sol b/contracts/evmx/watcher/precompiles/WritePrecompile.sol
index 49409261..1f6e1f16 100644
--- a/contracts/evmx/watcher/precompiles/WritePrecompile.sol
+++ b/contracts/evmx/watcher/precompiles/WritePrecompile.sol
@@ -134,6 +134,9 @@ contract WritePrecompile is WritePrecompileStorage, Initializable, Ownable, Watc
             } else {
                 queueParams_.overrideParams.gasLimit = 10_000_000; // other chains default gas limit
             }
+        } else if (queueParams_.transaction.chainSlug == 999) {
+            // HyperEVM default gas limit
+            queueParams_.overrideParams.gasLimit = 1_500_000;
         }
 
         // For write precompile, encode the payload parameters
diff --git a/deployments/dev_verification.json b/deployments/dev_verification.json
index fcc8908c..8941792d 100644
--- a/deployments/dev_verification.json
+++ b/deployments/dev_verification.json
@@ -53,11 +53,7 @@
       "0xbDE0D2da12F703Ccd275d721214745BccDCAD124",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        1,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [1, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "56": [
@@ -114,11 +110,7 @@
       "0x5e1641B190B71ECCc85b1ECe934F31cD9b3dcF7a",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        56,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [56, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "100": [
@@ -175,11 +167,7 @@
       "0x5e1641B190B71ECCc85b1ECe934F31cD9b3dcF7a",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        100,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [100, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "130": [
@@ -236,11 +224,7 @@
       "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        130,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [130, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "137": [
@@ -297,11 +281,7 @@
       "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        137,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [137, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "146": [
@@ -358,11 +338,7 @@
       "0x5e1641B190B71ECCc85b1ECe934F31cD9b3dcF7a",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        146,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [146, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "169": [
@@ -419,11 +395,7 @@
       "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        169,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [169, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "484": [
@@ -480,11 +452,7 @@
       "0xbDE0D2da12F703Ccd275d721214745BccDCAD124",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        484,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [484, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "747": [
@@ -541,11 +509,7 @@
       "0xbDE0D2da12F703Ccd275d721214745BccDCAD124",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        747,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [747, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "999": [
@@ -602,11 +566,7 @@
       "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        999,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [999, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "1329": [
@@ -663,11 +623,7 @@
       "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        1329,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [1329, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "5000": [
@@ -724,11 +680,7 @@
       "0xd8afBbB32706E7544f075151D4666D5B0B1F22CA",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        5000,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [5000, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ],
     [
       "0xeAb2e310A53FD3Fb34C2944690a79DFB2e834F20",
@@ -783,11 +735,7 @@
       "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        5000,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [5000, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "8453": [],
@@ -825,9 +773,7 @@
       "0xEd2a3cd034D873096E40C7E2EfB0e5BE99bBbF7a",
       "PromiseResolver",
       "contracts/evmx/watcher/PromiseResolver.sol",
-      [
-        "0xCeEc354B7784C667Bd661483Ae30C8d4eBA96e1d"
-      ]
+      ["0xCeEc354B7784C667Bd661483Ae30C8d4eBA96e1d"]
     ],
     [
       "0x2ECF118De0d747980c5d934E78a5746B6b6fD441",
@@ -935,11 +881,7 @@
       "0x5F77550E3072c913A20B2fbdAb14026fe0E8B450",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        43114,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [43114, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ],
     [
       "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38",
@@ -954,11 +896,7 @@
       "0x5e1641B190B71ECCc85b1ECe934F31cD9b3dcF7a",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        43114,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [43114, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "57073": [
@@ -1015,11 +953,7 @@
       "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        57073,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [57073, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "59144": [
@@ -1076,11 +1010,7 @@
       "0x5e1641B190B71ECCc85b1ECe934F31cD9b3dcF7a",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        59144,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [59144, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "80094": [
@@ -1137,11 +1067,7 @@
       "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        80094,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [80094, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "84532": [],
@@ -1200,11 +1126,7 @@
       "0x5e1641B190B71ECCc85b1ECe934F31cD9b3dcF7a",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [
-        747474,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
-      ]
+      [747474, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
     ]
   ],
   "11155420": []
diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json
index 468e3a76..40a94f0c 100644
--- a/deployments/prod_addresses.json
+++ b/deployments/prod_addresses.json
@@ -4,6 +4,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 23384432,
@@ -17,6 +18,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 141266670,
@@ -30,6 +32,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 61510453,
@@ -43,6 +46,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 42253473,
@@ -56,6 +60,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 27383897,
@@ -69,6 +74,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2",
+    "FeesPlugV2": "0x37db801a12F45300f768F88eb03Bdfb0769e8d1A",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 76569494,
@@ -82,6 +88,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 47181499,
@@ -95,6 +102,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 6390809,
@@ -108,6 +116,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 6737511,
@@ -121,6 +130,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 40559259,
@@ -134,6 +144,7 @@
     "FastSwitchboard": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
     "FastSwitchboardId": "1",
     "FeesPlug": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7",
+    "FeesPlugV2": "0x3dcbbcbD412aFaA0C1c46eb853Fd4DA363306C3d",
     "Socket": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "SocketBatcher": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "startBlock": 14120257,
@@ -147,6 +158,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 168597971,
@@ -160,6 +172,7 @@
     "FastSwitchboard": "0x2277CF90Ce1cfE33b9576Ec06D9C4d053ee5f882",
     "FastSwitchboardId": "1",
     "FeesPlug": "0xFB349dcc5A1cB87Ff3A2b91C343814647AE820FC",
+    "FeesPlugV2": "0xFB349dcc5A1cB87Ff3A2b91C343814647AE820FC",
     "Socket": "0xb8Bd628646BFfE5632B462F213F97DE038dBD8b2",
     "SocketBatcher": "0x334A27A9aBe4413CD3fE7EF777196eE0568b29D4",
     "startBlock": 85006520,
@@ -173,6 +186,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0x37db801a12F45300f768F88eb03Bdfb0769e8d1A",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 35670115,
@@ -194,7 +208,7 @@
     "DeployForwarderImpl": "0xf05f680E0611b81eD0255A1Cd829540504765711",
     "ERC1967Factory": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FeesManager": "0xB63ab15c208A16a0480036C06e8828A4682E0B34",
-    "FeesManagerImpl": "0x9f3CDba2262DF94e415E092A4228ee7E6846ea1b",
+    "FeesManagerImpl": "0x22D99b38e32198D5C09C01AF872C6dBc0c875E92",
     "FeesPool": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
     "PromiseResolver": "0xFB349dcc5A1cB87Ff3A2b91C343814647AE820FC",
     "ReadPrecompile": "0x74D52027137a450b68315478AAE4528Ba839ea13",
@@ -205,13 +219,14 @@
     "Watcher": "0x2566Bef2e914c7482d6FCB4955403fb0865951A5",
     "WatcherImpl": "0x03029500B038980745c5a671f271340CF9AF5830",
     "WritePrecompile": "0xc6506b1C3f34297B4de32f08d8d50CB0E9e64842",
-    "WritePrecompileImpl": "0xcd460687fe2a74ddEE8f2E3d791e1df306713353"
+    "WritePrecompileImpl": "0xb8613c3BfF759Bd4596DBf4e7a57195f08454EFB"
   },
   "42161": {
     "ContractFactoryPlug": "0x176C18F871b9b0F363cBDF3b5a1872F6069CF538",
     "FastSwitchboard": "0xb3A5132Df72F1597ab474d73d387ecF8647af669",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x168d7bAb883a6430F0200bcaaFAf080371477B3D",
+    "FeesPlugV2": "0xd4f7d5FeBaBF681f86dD185b77a4053CDd5Fe505",
     "Socket": "0xdb6d9dB6e4190a63FD3c50Af51785a9c3BB4080b",
     "SocketBatcher": "0x9e95545a13351aA79096839738d0B09434804D03",
     "startBlock": 380165474,
@@ -225,6 +240,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 68887506,
@@ -238,6 +254,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 24633467,
@@ -251,6 +268,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 23661748,
@@ -264,6 +282,7 @@
     "FastSwitchboard": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
     "FastSwitchboardId": "1",
     "FeesPlug": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7",
+    "FeesPlugV2": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "startBlock": 10646345,
@@ -277,6 +296,7 @@
     "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA",
     "FastSwitchboardId": "1",
     "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
+    "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15",
     "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
     "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
     "startBlock": 11389173,
diff --git a/deployments/prod_verification.json b/deployments/prod_verification.json
index f95b60e8..e824acec 100644
--- a/deployments/prod_verification.json
+++ b/deployments/prod_verification.json
@@ -1,11 +1,70 @@
 {
-  "1": [],
-  "10": [],
+  "1": [
+    [
+      "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9",
+      "FeesPlug",
+      "contracts/evmx/plugs/FeesPlug.sol",
+      [
+        "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
+        "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23"
+      ]
+    ]
+  ],
+  "10": [
+    [
+      "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9",
+      "FeesPlug",
+      "contracts/evmx/plugs/FeesPlug.sol",
+      [
+        "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
+        "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23"
+      ]
+    ]
+  ],
   "56": [],
   "100": [],
-  "130": [],
-  "137": [],
-  "146": [],
+  "130": [
+    [
+      "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9",
+      "FeesPlug",
+      "contracts/evmx/plugs/FeesPlug.sol",
+      [
+        "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
+        "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23"
+      ]
+    ],
+    [
+      "0x79bB063eC647A51904d4Cf4c26144606A945bb32",
+      "FeesPlug",
+      "contracts/evmx/plugs/FeesPlug.sol",
+      [
+        "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
+        "0x7BD61c667f869FB21b77626f0Ac0ACEE51e4BE7C"
+      ]
+    ]
+  ],
+  "137": [
+    [
+      "0x37db801a12F45300f768F88eb03Bdfb0769e8d1A",
+      "FeesPlug",
+      "contracts/evmx/plugs/FeesPlug.sol",
+      [
+        "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
+        "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23"
+      ]
+    ]
+  ],
+  "146": [
+    [
+      "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9",
+      "FeesPlug",
+      "contracts/evmx/plugs/FeesPlug.sol",
+      [
+        "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
+        "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23"
+      ]
+    ]
+  ],
   "169": [
     [
       "0xd90a33b0414F5C0De5F315428190598945BbEde2",
@@ -60,7 +119,11 @@
       "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [169, "0x7BD61c667f869FB21b77626f0Ac0ACEE51e4BE7C", "EVMX"]
+      [
+        169,
+        "0x7BD61c667f869FB21b77626f0Ac0ACEE51e4BE7C",
+        "EVMX"
+      ]
     ]
   ],
   "484": [],
@@ -118,11 +181,35 @@
       "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
       "Socket",
       "contracts/protocol/Socket.sol",
-      [747, "0x7BD61c667f869FB21b77626f0Ac0ACEE51e4BE7C", "EVMX"]
+      [
+        747,
+        "0x7BD61c667f869FB21b77626f0Ac0ACEE51e4BE7C",
+        "EVMX"
+      ]
+    ]
+  ],
+  "999": [
+    [
+      "0x3dcbbcbD412aFaA0C1c46eb853Fd4DA363306C3d",
+      "FeesPlug",
+      "contracts/evmx/plugs/FeesPlug.sol",
+      [
+        "0x20BB708875C3E99cbBD7239CeeB2670b795F4829",
+        "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23"
+      ]
+    ]
+  ],
+  "1329": [
+    [
+      "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9",
+      "FeesPlug",
+      "contracts/evmx/plugs/FeesPlug.sol",
+      [
+        "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
+        "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23"
+      ]
     ]
   ],
-  "999": [],
-  "1329": [],
   "5000": [
     [
       "0xb8Bd628646BFfE5632B462F213F97DE038dBD8b2",
@@ -135,10 +222,47 @@
       ]
     ]
   ],
-  "8453": [],
-  "12921": [],
-  "42161": [],
-  "43114": [],
+  "8453": [
+    [
+      "0x37db801a12F45300f768F88eb03Bdfb0769e8d1A",
+      "FeesPlug",
+      "contracts/evmx/plugs/FeesPlug.sol",
+      [
+        "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
+        "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23"
+      ]
+    ]
+  ],
+  "12921": [
+    [
+      "0x22D99b38e32198D5C09C01AF872C6dBc0c875E92",
+      "FeesManager",
+      "contracts/evmx/fees/FeesManager.sol",
+      []
+    ]
+  ],
+  "42161": [
+    [
+      "0xd4f7d5FeBaBF681f86dD185b77a4053CDd5Fe505",
+      "FeesPlug",
+      "contracts/evmx/plugs/FeesPlug.sol",
+      [
+        "0xdb6d9dB6e4190a63FD3c50Af51785a9c3BB4080b",
+        "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23"
+      ]
+    ]
+  ],
+  "43114": [
+    [
+      "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9",
+      "FeesPlug",
+      "contracts/evmx/plugs/FeesPlug.sol",
+      [
+        "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb",
+        "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23"
+      ]
+    ]
+  ],
   "57073": [],
   "59144": [],
   "80094": [],
diff --git a/deployments/stage_addresses.json b/deployments/stage_addresses.json
index 48240cc0..40b9ae24 100644
--- a/deployments/stage_addresses.json
+++ b/deployments/stage_addresses.json
@@ -8,8 +8,19 @@
     "SocketBatcher": "0x06234dB2D69Ac158793a3ce59c3764422028E964",
     "startBlock": 141180188,
     "SUSDC": "0x6D54668ba18B425a1DbFC0BD720145c0aeE97f65",
+    "SwitchboardIdToAddressMap": {}
+  },
+  "137": {
+    "ContractFactoryPlug": "0x55110083f087730A9c0FFf2379FC5F3356fFc5Bf",
+    "FastSwitchboard": "0xafaeb27cb9251E3a4260d7BaA548Ec907FDA8221",
+    "FastSwitchboardId": "1",
+    "FeesPlug": "0x1BD0acB874f9ce9771a838c662ac1a05ea478f3A",
+    "Socket": "0xbb43cF33A4eA5f5A8Bc95297e3E614A40fdcCD3d",
+    "SocketBatcher": "0xeD59644F0B2041dF9d2f341c146FfD413227E57c",
+    "startBlock": 76640333,
+    "SUSDC": "0x39Fa4b853e1b67Fd0c3B8CFcc0e156b0e21a5B01",
     "SwitchboardIdToAddressMap": {
-      "1": "0xD78f99D62BeaF0918bB0601C68EB537b6703Ce63"
+      "1": "0xafaeb27cb9251E3a4260d7BaA548Ec907FDA8221"
     }
   },
   "8453": {
@@ -21,9 +32,7 @@
     "SocketBatcher": "0x356DBc19C69832010f92c963a8Ded6b5f9deeaCe",
     "startBlock": 35584928,
     "SUSDC": "0x900Cf1914Adcee43Cb1A69c042ded801Cd5051Ef",
-    "SwitchboardIdToAddressMap": {
-      "1": "0xd3009795fFDc64Ee0d23198772a58ca9e53EEd25"
-    }
+    "SwitchboardIdToAddressMap": {}
   },
   "14323": {
     "AddressResolver": "0xE4C438c46b9dB51e298A1F65151eDe8418be009A",
@@ -60,22 +69,31 @@
     "SocketBatcher": "0x0d7994B4aAc7cbdFAFEAED0B9B51E7de0586ec6f",
     "startBlock": 379484006,
     "SUSDC": "0x0c17822dcC44F8202F176a4960EAC8da8FDbfCA5",
+    "SwitchboardIdToAddressMap": {}
+  },
+  "57073": {
+    "ContractFactoryPlug": "0xbb43cF33A4eA5f5A8Bc95297e3E614A40fdcCD3d",
+    "FastSwitchboard": "0x23DB8c6f2745896287f73a12F75fEa5230836675",
+    "FastSwitchboardId": "1",
+    "FeesPlug": "0x9D2394546141e494197Ee9a73AC7e3526Cb3241C",
+    "Socket": "0x89a4325470b0E5074Eaab640E1863B7bD11a2eA9",
+    "SocketBatcher": "0xa001CF808f6062fdd78Fd971Ed3b24BB51c12ECd",
+    "startBlock": 24785614,
+    "SUSDC": "0x11a69F5e870e43832c01c9Ac02b8b6dC9c98A029",
     "SwitchboardIdToAddressMap": {
-      "1": "0x7E33B305e12aD0E73B3aedBE67A53B7818732d7d"
+      "1": "0x23DB8c6f2745896287f73a12F75fEa5230836675"
     }
   },
   "84532": {
     "ContractFactoryPlug": "0x24A6Da9bAa5ba4AE8AF411546429b7eD2B29aA48",
     "FastSwitchboard": "0x7442C13842dC293fce94Bf86116068F8FF62Ecf9",
     "FastSwitchboardId": "1",
-    "FeesPlug": "0x5cdcD147A01Fc29C20c2061a89faF01F20363A20",
+    "FeesPlug": "0x788dA894736D9501B022D5bB3648763F252ec0E6",
     "Socket": "0x4861c9EB83d8ba745a184E5a11a50B6be25e4dDb",
     "SocketBatcher": "0x5132751743cD59DB406A043d9983984E52Ca2cD5",
     "startBlock": 31095773,
     "SUSDC": "0x99D946bB805adba0233956E475bf70ED09d50d40",
-    "SwitchboardIdToAddressMap": {
-      "1": "0x7442C13842dC293fce94Bf86116068F8FF62Ecf9"
-    }
+    "SwitchboardIdToAddressMap": {}
   },
   "421614": {
     "ContractFactoryPlug": "0x5B6ed8Aaa52643d1d2d3409398e30b4eAdC767f2",
@@ -99,8 +117,6 @@
     "SocketBatcher": "0xaA02a6FdA809cF11c4e26a82AcfE7666204736A0",
     "startBlock": 33078325,
     "SUSDC": "0x3039AC5cC80C531c682045278f92439D740fa62B",
-    "SwitchboardIdToAddressMap": {
-      "1": "0xbE5CB1cf4e049F124B868DebF15d9B04ce0817b3"
-    }
+    "SwitchboardIdToAddressMap": {}
   }
 }
diff --git a/deployments/stage_verification.json b/deployments/stage_verification.json
index 757bd77d..143efdbc 100644
--- a/deployments/stage_verification.json
+++ b/deployments/stage_verification.json
@@ -308,6 +308,15 @@
     ]
   ],
   "84532": [
+    [
+      "0x788dA894736D9501B022D5bB3648763F252ec0E6",
+      "FeesPlug",
+      "contracts/evmx/plugs/FeesPlug.sol",
+      [
+        "0x4861c9EB83d8ba745a184E5a11a50B6be25e4dDb",
+        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18"
+      ]
+    ],
     [
       "0x99D946bB805adba0233956E475bf70ED09d50d40",
       "SUSDC",
diff --git a/hardhat-scripts/config/config.ts b/hardhat-scripts/config/config.ts
index f6eb1e45..0cf4686c 100644
--- a/hardhat-scripts/config/config.ts
+++ b/hardhat-scripts/config/config.ts
@@ -76,7 +76,7 @@ const MODE_CONFIGS: Record<DeploymentMode, ModeConfig> = {
     chains: [
       // ChainSlug.MAINNET,
       ChainSlug.ARBITRUM,
-      ChainSlug.ARBITRUM_SEPOLIA,
+      // ChainSlug.ARBITRUM_SEPOLIA,
       ChainSlug.OPTIMISM,
       ChainSlug.OPTIMISM_SEPOLIA,
       ChainSlug.BASE,
diff --git a/hardhat-scripts/utils/overrides.ts b/hardhat-scripts/utils/overrides.ts
index dc4c17d2..0e5345cd 100644
--- a/hardhat-scripts/utils/overrides.ts
+++ b/hardhat-scripts/utils/overrides.ts
@@ -29,6 +29,9 @@ export const chainOverrides: {
     gasLimit: 3_000_000,
     // gasPrice: 200_000_000,
   },
+  [ChainSlug.SONIC]: {
+    gasLimit: 2_000_000,
+  },
   [ChainSlug.BSC]: {
     gasLimit: 6_000_000,
   },
@@ -38,10 +41,9 @@ export const chainOverrides: {
   },
 
   [ChainSlug.POLYGON_MAINNET]: {
-    gasPriceMultiplier: 2,
-    gasLimit: 3_000_000,
+    // gasPriceMultiplier: 2,
+    gasLimit: 3_00_000,
   },
-
   [ChainSlug.SEPOLIA]: {
     type: 1,
     gasLimit: 2_000_000,
diff --git a/src/chain-enums/currency.ts b/src/chain-enums/currency.ts
index ef05435f..51ab10fd 100644
--- a/src/chain-enums/currency.ts
+++ b/src/chain-enums/currency.ts
@@ -3,7 +3,7 @@ import { NativeTokens } from "./native-tokens";
 
 export const Currency = {
   [ChainSlug.BSC]: NativeTokens.BINANCECOIN,
-  [ChainSlug.POLYGON_MAINNET]: NativeTokens.MATIC_NETWORK,
+  [ChainSlug.POLYGON_MAINNET]: NativeTokens.POLYGON_ECOSYSTEM_TOKEN,
   [ChainSlug.SX_NETWORK_TESTNET]: NativeTokens.SX_NETWORK_2,
   [ChainSlug.SX_NETWORK]: NativeTokens.SX_NETWORK_2,
   [ChainSlug.MANTLE]: NativeTokens.MANTLE,
@@ -16,7 +16,7 @@ export const Currency = {
   [ChainSlug.AVALANCHE]: NativeTokens.AVALANCHE_2,
   [ChainSlug.XLAYER]: NativeTokens.OKB,
   [ChainSlug.POLTER_TESTNET]: NativeTokens.AAVEGOTCHI,
-  [ChainSlug.POLYGON_AMOY]: NativeTokens.MATIC_NETWORK,
+  [ChainSlug.POLYGON_AMOY]: NativeTokens.POLYGON_ECOSYSTEM_TOKEN,
   [ChainSlug.OPBNB]: NativeTokens.BINANCECOIN,
   [ChainSlug.GEIST]: NativeTokens.AAVEGOTCHI,
   [ChainSlug.SONIC]: NativeTokens.SONIC_3,
diff --git a/src/chain-enums/native-tokens.ts b/src/chain-enums/native-tokens.ts
index 48e8c3e7..2f891b31 100644
--- a/src/chain-enums/native-tokens.ts
+++ b/src/chain-enums/native-tokens.ts
@@ -1,7 +1,6 @@
 // add coingecko token id here
 export enum NativeTokens {
   ETHEREUM = "ethereum",
-  MATIC_NETWORK = "matic-network",
   BINANCECOIN = "binancecoin",
   SX_NETWORK_2 = "sx-network-2",
   MANTLE = "mantle",