diff --git a/typescript/infra/config/environments/mainnet/interchain/addresses.json b/typescript/infra/config/environments/mainnet/interchain/addresses.json
deleted file mode 100644
index 6324ea58e..000000000
--- a/typescript/infra/config/environments/mainnet/interchain/addresses.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "bsc": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "avalanche": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "polygon": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "celo": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "arbitrum": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "optimism": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "ethereum": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "moonbeam": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  }
-}
diff --git a/typescript/infra/config/environments/mainnet/interchain/queries/addresses.json b/typescript/infra/config/environments/mainnet/interchain/queries/addresses.json
deleted file mode 100644
index 4e97741e5..000000000
--- a/typescript/infra/config/environments/mainnet/interchain/queries/addresses.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "bsc": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "avalanche": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "polygon": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "celo": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "arbitrum": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "optimism": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "ethereum": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "moonbeam": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  }
-}
diff --git a/typescript/infra/config/environments/mainnet/middleware/accounts/addresses.json b/typescript/infra/config/environments/mainnet/middleware/accounts/addresses.json
new file mode 100644
index 000000000..f45e3f54e
--- /dev/null
+++ b/typescript/infra/config/environments/mainnet/middleware/accounts/addresses.json
@@ -0,0 +1,26 @@
+{
+  "bsc": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "avalanche": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "polygon": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "celo": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "arbitrum": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "optimism": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "ethereum": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "moonbeam": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  }
+}
diff --git a/typescript/infra/config/environments/mainnet/interchain/verification.json b/typescript/infra/config/environments/mainnet/middleware/accounts/verification.json
similarity index 67%
rename from typescript/infra/config/environments/mainnet/interchain/verification.json
rename to typescript/infra/config/environments/mainnet/middleware/accounts/verification.json
index bc16df45d..7fe3558ee 100644
--- a/typescript/infra/config/environments/mainnet/interchain/verification.json
+++ b/typescript/infra/config/environments/mainnet/middleware/accounts/verification.json
@@ -2,7 +2,7 @@
   "bsc": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -10,7 +10,7 @@
   "avalanche": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -18,7 +18,7 @@
   "polygon": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -26,7 +26,7 @@
   "celo": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -34,7 +34,7 @@
   "arbitrum": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -42,7 +42,7 @@
   "optimism": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -50,7 +50,7 @@
   "ethereum": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -58,7 +58,7 @@
   "moonbeam": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
diff --git a/typescript/infra/config/environments/mainnet/middleware/queries/addresses.json b/typescript/infra/config/environments/mainnet/middleware/queries/addresses.json
new file mode 100644
index 000000000..b5fe907aa
--- /dev/null
+++ b/typescript/infra/config/environments/mainnet/middleware/queries/addresses.json
@@ -0,0 +1,26 @@
+{
+  "bsc": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "avalanche": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "polygon": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "celo": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "arbitrum": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "optimism": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "ethereum": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "moonbeam": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  }
+}
diff --git a/typescript/infra/config/environments/mainnet/interchain/queries/verification.json b/typescript/infra/config/environments/mainnet/middleware/queries/verification.json
similarity index 67%
rename from typescript/infra/config/environments/mainnet/interchain/queries/verification.json
rename to typescript/infra/config/environments/mainnet/middleware/queries/verification.json
index d19452961..acbfae28a 100644
--- a/typescript/infra/config/environments/mainnet/interchain/queries/verification.json
+++ b/typescript/infra/config/environments/mainnet/middleware/queries/verification.json
@@ -2,7 +2,7 @@
   "bsc": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -10,7 +10,7 @@
   "avalanche": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -18,7 +18,7 @@
   "polygon": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -26,7 +26,7 @@
   "celo": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -34,7 +34,7 @@
   "arbitrum": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -42,7 +42,7 @@
   "optimism": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -50,7 +50,7 @@
   "ethereum": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -58,7 +58,7 @@
   "moonbeam": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
diff --git a/typescript/infra/config/environments/testnet2/interchain/addresses.json b/typescript/infra/config/environments/testnet2/interchain/addresses.json
deleted file mode 100644
index 277a28647..000000000
--- a/typescript/infra/config/environments/testnet2/interchain/addresses.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "alfajores": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "fuji": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "mumbai": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "bsctestnet": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "goerli": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "moonbasealpha": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "optimismgoerli": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  },
-  "arbitrumgoerli": {
-    "router": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F"
-  }
-}
diff --git a/typescript/infra/config/environments/testnet2/interchain/queries/addresses.json b/typescript/infra/config/environments/testnet2/interchain/queries/addresses.json
deleted file mode 100644
index e224b7fb7..000000000
--- a/typescript/infra/config/environments/testnet2/interchain/queries/addresses.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "alfajores": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "fuji": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "mumbai": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "bsctestnet": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "goerli": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "moonbasealpha": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "optimismgoerli": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  },
-  "arbitrumgoerli": {
-    "router": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca"
-  }
-}
diff --git a/typescript/infra/config/environments/testnet2/middleware/accounts/addresses.json b/typescript/infra/config/environments/testnet2/middleware/accounts/addresses.json
new file mode 100644
index 000000000..0efdde877
--- /dev/null
+++ b/typescript/infra/config/environments/testnet2/middleware/accounts/addresses.json
@@ -0,0 +1,26 @@
+{
+  "alfajores": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "fuji": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "mumbai": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "bsctestnet": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "goerli": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "moonbasealpha": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "optimismgoerli": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  },
+  "arbitrumgoerli": {
+    "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E"
+  }
+}
diff --git a/typescript/infra/config/environments/testnet2/interchain/verification.json b/typescript/infra/config/environments/testnet2/middleware/accounts/verification.json
similarity index 67%
rename from typescript/infra/config/environments/testnet2/interchain/verification.json
rename to typescript/infra/config/environments/testnet2/middleware/accounts/verification.json
index 46a05f277..0c6190670 100644
--- a/typescript/infra/config/environments/testnet2/interchain/verification.json
+++ b/typescript/infra/config/environments/testnet2/middleware/accounts/verification.json
@@ -2,7 +2,7 @@
   "alfajores": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -10,7 +10,7 @@
   "fuji": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -18,7 +18,7 @@
   "mumbai": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -26,7 +26,7 @@
   "bsctestnet": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -34,7 +34,7 @@
   "goerli": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -42,7 +42,7 @@
   "moonbasealpha": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -50,7 +50,7 @@
   "optimismgoerli": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -58,7 +58,7 @@
   "arbitrumgoerli": [
     {
       "name": "InterchainAccountRouter",
-      "address": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
+      "address": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
       "isProxy": false,
       "constructorArguments": ""
     }
diff --git a/typescript/infra/config/environments/testnet2/middleware/queries/addresses.json b/typescript/infra/config/environments/testnet2/middleware/queries/addresses.json
new file mode 100644
index 000000000..e09eed842
--- /dev/null
+++ b/typescript/infra/config/environments/testnet2/middleware/queries/addresses.json
@@ -0,0 +1,26 @@
+{
+  "alfajores": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "fuji": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "mumbai": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "bsctestnet": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "goerli": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "moonbasealpha": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "optimismgoerli": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  },
+  "arbitrumgoerli": {
+    "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd"
+  }
+}
diff --git a/typescript/infra/config/environments/testnet2/interchain/queries/verification.json b/typescript/infra/config/environments/testnet2/middleware/queries/verification.json
similarity index 67%
rename from typescript/infra/config/environments/testnet2/interchain/queries/verification.json
rename to typescript/infra/config/environments/testnet2/middleware/queries/verification.json
index 80261d041..66c8090b9 100644
--- a/typescript/infra/config/environments/testnet2/interchain/queries/verification.json
+++ b/typescript/infra/config/environments/testnet2/middleware/queries/verification.json
@@ -2,7 +2,7 @@
   "alfajores": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -10,7 +10,7 @@
   "fuji": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -18,7 +18,7 @@
   "mumbai": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -26,7 +26,7 @@
   "bsctestnet": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -34,7 +34,7 @@
   "goerli": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -42,7 +42,7 @@
   "moonbasealpha": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -50,7 +50,7 @@
   "optimismgoerli": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
@@ -58,7 +58,7 @@
   "arbitrumgoerli": [
     {
       "name": "InterchainQueryRouter",
-      "address": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+      "address": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
       "isProxy": false,
       "constructorArguments": ""
     }
diff --git a/typescript/infra/scripts/debug-message.ts b/typescript/infra/scripts/debug-message.ts
index 96d2901a3..ab8ad0d1d 100644
--- a/typescript/infra/scripts/debug-message.ts
+++ b/typescript/infra/scripts/debug-message.ts
@@ -138,6 +138,18 @@ async function checkMessage(
       'Calling recipient `handle` function from the inbox does not revert',
     );
   } catch (err: any) {
+    const data = (
+      await recipient.populateTransaction.handle(
+        message.parsed.origin,
+        message.parsed.sender,
+        message.parsed.body,
+      )
+    ).data;
+    console.log('Simulated call', {
+      from: destinationInbox.address,
+      to: recipient.address,
+      data,
+    });
     console.error(`Error calling recipient \`handle\` function from the inbox`);
     if (err.reason) {
       console.error('Reason: ', err.reason);
diff --git a/typescript/infra/scripts/merge-sdk-contract-addresses.ts b/typescript/infra/scripts/merge-sdk-contract-addresses.ts
index 71516c20a..510ee7275 100644
--- a/typescript/infra/scripts/merge-sdk-contract-addresses.ts
+++ b/typescript/infra/scripts/merge-sdk-contract-addresses.ts
@@ -14,8 +14,8 @@ import {
 } from './utils';
 
 const ARTIFACTS_TO_MERGE = [
-  { pathSegment: 'interchain', targetKey: 'interchainAccountRouter' },
-  { pathSegment: 'interchain/queries', targetKey: 'interchainQueryRouter' },
+  { pathSegment: 'middleware/accounts', targetKey: 'interchainAccountRouter' },
+  { pathSegment: 'middleware/queries', targetKey: 'interchainQueryRouter' },
   { pathSegment: 'create2', targetKey: 'create2Factory' },
 ];
 
diff --git a/typescript/infra/scripts/middleware/deploy-accounts.ts b/typescript/infra/scripts/middleware/deploy-accounts.ts
index 5d02e2c79..9101dccb7 100644
--- a/typescript/infra/scripts/middleware/deploy-accounts.ts
+++ b/typescript/infra/scripts/middleware/deploy-accounts.ts
@@ -23,7 +23,10 @@ async function main() {
   const multiProvider = await coreConfig.getMultiProvider();
   const core = HyperlaneCore.fromEnvironment(environment, multiProvider as any);
 
-  const dir = path.join(getEnvironmentDirectory(environment), 'interchain');
+  const dir = path.join(
+    getEnvironmentDirectory(environment),
+    'middleware/accounts',
+  );
 
   // config gcp deployer key as owner
   const configMap = await getConfiguration(environment, multiProvider);
diff --git a/typescript/infra/scripts/middleware/deploy-queries.ts b/typescript/infra/scripts/middleware/deploy-queries.ts
index 89caf9cba..b8eeef775 100644
--- a/typescript/infra/scripts/middleware/deploy-queries.ts
+++ b/typescript/infra/scripts/middleware/deploy-queries.ts
@@ -25,7 +25,7 @@ async function main() {
 
   const dir = path.join(
     getEnvironmentDirectory(environment),
-    'interchain/queries',
+    'middleware/queries',
   );
 
   // config gcp deployer key as owner
diff --git a/typescript/sdk/src/consts/environments/mainnet.json b/typescript/sdk/src/consts/environments/mainnet.json
index aeb406bbb..455675fa1 100644
--- a/typescript/sdk/src/consts/environments/mainnet.json
+++ b/typescript/sdk/src/consts/environments/mainnet.json
@@ -80,8 +80,8 @@
       "beacon": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908"
     },
     "outboxValidatorManager": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "bsc": {
@@ -165,8 +165,8 @@
       "beacon": "0x0D63128D887159d63De29497dfa45AFc7C699AE4"
     },
     "outboxValidatorManager": "0xBF12ef4B9f307463D3FB59c3604F294dDCe287E2",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "polygon": {
@@ -250,8 +250,8 @@
       "beacon": "0xe042D1fbDf59828dd16b9649Ede7abFc856F7a6c"
     },
     "outboxValidatorManager": "0xFC62DeF1f08793aBf0E67f69257c6be258194F72",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "celo": {
@@ -335,8 +335,8 @@
       "beacon": "0x17E216fBb22dF4ef8A6640ae9Cb147C92710ac84"
     },
     "outboxValidatorManager": "0x1Ab68dC4f7b6cfcd00218D4b761b7F3b5a724555",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "arbitrum": {
@@ -420,8 +420,8 @@
       "beacon": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908"
     },
     "outboxValidatorManager": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "optimism": {
@@ -505,8 +505,8 @@
       "beacon": "0x182E8d7c5F1B06201b102123FC7dF0EaeB445a7B"
     },
     "outboxValidatorManager": "0x99ca8c74cE7Cfa9d72A51fbb05F9821f5f826b3a",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "ethereum": {
@@ -590,8 +590,8 @@
       "beacon": "0x7f50C5776722630a0024fAE05fDe8b47571D7B39"
     },
     "outboxValidatorManager": "0x3a464f746D23Ab22155710f44dB16dcA53e0775E",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "moonbeam": {
@@ -675,8 +675,8 @@
       "beacon": "0x2f2aFaE1139Ce54feFC03593FeE8AB2aDF4a85A7"
     },
     "outboxValidatorManager": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   }
 }
diff --git a/typescript/sdk/src/consts/environments/testnet2.json b/typescript/sdk/src/consts/environments/testnet2.json
index 3d5b165b2..03d6ef4ce 100644
--- a/typescript/sdk/src/consts/environments/testnet2.json
+++ b/typescript/sdk/src/consts/environments/testnet2.json
@@ -80,8 +80,8 @@
       "beacon": "0xD3CCCbde1CCdB99313f25F8CA1A7B5C13BfD3dA2"
     },
     "outboxValidatorManager": "0xEB25e6e42B743a815E5C0409007993a828a0565f",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "fuji": {
@@ -165,8 +165,8 @@
       "beacon": "0x16C20625B11E0c8187Cc1B3e4ceedc35C48D8013"
     },
     "outboxValidatorManager": "0x41e1799D0249FbB3Fc9e467b813b7479c96a3Ec3",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "mumbai": {
@@ -250,8 +250,8 @@
       "beacon": "0xaCF0B0bA84db40cDC48235De2d6cF96540fFa5CD"
     },
     "outboxValidatorManager": "0x5c8cC5d94a7F84893e155457E4C1244f6e2B7F8D",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "bsctestnet": {
@@ -335,8 +335,8 @@
       "beacon": "0xa318ffca299412ce76B7cb980850ceDB15584E7e"
     },
     "outboxValidatorManager": "0xE0745955baF7e614707E22c90EA14d329C38941D",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "goerli": {
@@ -420,8 +420,8 @@
       "beacon": "0x589C201a07c26b4725A4A829d772f24423da480B"
     },
     "outboxValidatorManager": "0x6966b0E55883d49BFB24539356a2f8A673E02039",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "moonbasealpha": {
@@ -505,8 +505,8 @@
       "beacon": "0x6966b0E55883d49BFB24539356a2f8A673E02039"
     },
     "outboxValidatorManager": "0x44b764045BfDC68517e10e783E69B376cef196B2",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "optimismgoerli": {
@@ -590,8 +590,8 @@
       "beacon": "0x6966b0E55883d49BFB24539356a2f8A673E02039"
     },
     "outboxValidatorManager": "0x44b764045BfDC68517e10e783E69B376cef196B2",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   },
   "arbitrumgoerli": {
@@ -675,8 +675,8 @@
       "beacon": "0xF7561c34f17A32D5620583A3397C304e7038a7F6"
     },
     "outboxValidatorManager": "0x98AAE089CaD930C64a76dD2247a2aC5773a4B8cE",
-    "interchainAccountRouter": "0xffD17672d47E7bB6192d5dBc12A096e00D1a206F",
-    "interchainQueryRouter": "0x3CAa52Ff595Cab4123735EC677F1D9E6E988f8ca",
+    "interchainAccountRouter": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E",
+    "interchainQueryRouter": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd",
     "create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a"
   }
 }