diff --git a/.gitmodules b/.gitmodules
index 66a28e2..94e23a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,3 +35,6 @@
 [submodule "lib/chainlink"]
 	path = lib/chainlink
 	url = https://github.com/smartcontractkit/chainlink
+[submodule "lib/utils"]
+	path = lib/utils
+	url = https://github.com/AngleProtocol/utils
diff --git a/helpers/common.sh b/helpers/common.sh
deleted file mode 100644
index 7d28f4c..0000000
--- a/helpers/common.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-function chain_to_uri {
-  chain=$1
-
-  case $chain in
-    "1")
-      echo $ETH_NODE_URI_MAINNET
-      ;;
-    "2")
-      echo $ETH_NODE_URI_ARBITRUM
-      ;;
-    "3")
-      echo $ETH_NODE_URI_POLYGON
-      ;;
-    "4")
-      echo $ETH_NODE_URI_GNOSIS
-      ;;
-    "5")
-      echo $ETH_NODE_URI_AVALANCHE
-      ;;
-    "6")
-      echo $ETH_NODE_URI_BASE
-      ;;
-    "7")
-        echo $ETH_NODE_URI_BSC
-        ;;
-    "8")
-        echo $ETH_NODE_URI_CELO
-        ;;
-    "9")
-        echo $ETH_NODE_URI_POLYGON_ZKEVM
-        ;;
-    "10")
-        echo $ETH_NODE_URI_OPTIMISM
-        ;;
-    "11")
-        echo $ETH_NODE_URI_LINEA
-        ;;
-    *)
-      ;;
-  esac
-}
-
-function chain_to_chainId {
-  chain=$1
-
-  case $chain in
-    "1")
-      echo "1"
-      ;;
-    "2")
-      echo "42161"
-      ;;
-    "3")
-      echo "137"
-      ;;
-    "4")
-      echo "100"
-      ;;
-    "5")
-      echo "43114"
-      ;;
-    "6")
-      echo "8453"
-      ;;
-    "7")
-        echo "56"
-        ;;
-    "8")
-        echo "42220"
-        ;;
-    "9")
-        echo "1101"
-        ;;
-    "10")
-        echo "10"
-        ;;
-    "11")
-        echo "59144"
-        ;;
-    *)
-      ;;
-  esac
-}
\ No newline at end of file
diff --git a/helpers/createProposal.sh b/helpers/createProposal.sh
index 47fad49..1cfc17b 100644
--- a/helpers/createProposal.sh
+++ b/helpers/createProposal.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-source helpers/common.sh
+source lib/utils/helpers/common.sh
 
 function usage {
   echo "bash createProposal.sh <script> <chain>"
@@ -111,7 +111,6 @@ function main {
     if [ $? -ne 0 ]; then
         echo ""
         echo "Test failed"
-        exit 1
     fi
 
     echo ""
diff --git a/helpers/fork.sh b/helpers/fork.sh
index f173a3e..ea784a1 100644
--- a/helpers/fork.sh
+++ b/helpers/fork.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-source helpers/common.sh
+source lib/utils/helpers/common.sh
 
 function main {
     if [ ! -f .env ]; then
diff --git a/helpers/runScript.sh b/helpers/runScript.sh
index e5b090b..d87c01d 100644
--- a/helpers/runScript.sh
+++ b/helpers/runScript.sh
@@ -1,7 +1,6 @@
 #! /bin/bash
 
-source helpers/common.sh
-
+source lib/utils/helpers/common.sh
 
 function usage {
   echo "bash runScript.sh <script> <chain>"
diff --git a/lib/utils b/lib/utils
new file mode 160000
index 0000000..2446740
--- /dev/null
+++ b/lib/utils
@@ -0,0 +1 @@
+Subproject commit 24467407a48676743488c0e355e47874aa71be21
diff --git a/remappings.txt b/remappings.txt
index 8eeb861..962e7d4 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -11,4 +11,5 @@ contracts/=contracts
 test/=test
 @openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts
 @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts
-@chainlink/=lib/chainlink
\ No newline at end of file
+@chainlink/=lib/chainlink
+utils/=lib/utils
\ No newline at end of file
diff --git a/scripts/Constants.s.sol b/scripts/Constants.s.sol
index 65f107b..fa5415d 100644
--- a/scripts/Constants.s.sol
+++ b/scripts/Constants.s.sol
@@ -12,44 +12,9 @@ import { CoreBorrow } from "borrow/coreBorrow/CoreBorrow.sol";
 import { ITreasury } from "borrow/interfaces/ITreasury.sol";
 import { TimelockController } from "oz/governance/TimelockController.sol";
 import { AngleGovernor } from "contracts/AngleGovernor.sol";
+import "utils/src/Constants.sol";
 import "./Interfaces.s.sol";
 
-enum ContractType {
-    AgEUR,
-    AgUSD,
-    AgEURLZ,
-    AgUSDLZ,
-    Angle,
-    AngleLZ,
-    AngleDistributor,
-    AngleMiddleman,
-    AngleRouter,
-    CoreBorrow,
-    CoreMerkl,
-    DistributionCreator,
-    Distributor,
-    FeeDistributor,
-    GaugeController,
-    Governor,
-    GovernorMultisig,
-    GuardianMultisig,
-    MerklMiddleman,
-    ProposalReceiver,
-    ProposalSender,
-    ProxyAdmin,
-    SmartWalletWhitelist,
-    StEUR,
-    StUSD,
-    Timelock,
-    TransmuterAgEUR,
-    TransmuterAgUSD,
-    TreasuryAgEUR,
-    TreasuryAgUSD,
-    veANGLE,
-    veBoost,
-    veBoostProxy
-}
-
 struct SubCall {
     uint256 chainId;
     address target;
@@ -69,25 +34,8 @@ uint256 constant initialQuorumNumerator = 5;
 uint256 constant initialShortCircuitNumerator = 10;
 bytes constant nullBytes = hex"";
 
-uint256 constant CHAIN_ETHEREUM = 1;
-uint256 constant CHAIN_ARBITRUM = 42161;
-uint256 constant CHAIN_AVALANCHE = 43114;
-uint256 constant CHAIN_OPTIMISM = 10;
-uint256 constant CHAIN_POLYGON = 137;
-uint256 constant CHAIN_FANTOM = 250;
-uint256 constant CHAIN_GNOSIS = 100;
-uint256 constant CHAIN_BNB = 56;
-uint256 constant CHAIN_CELO = 42220;
-uint256 constant CHAIN_POLYGONZKEVM = 1101;
-uint256 constant CHAIN_BASE = 8453;
-uint256 constant CHAIN_LINEA = 59144;
-uint256 constant CHAIN_MANTLE = 5000;
-uint256 constant CHAIN_AURORA = 1313161554;
 uint256 constant CHAIN_SOURCE = CHAIN_ETHEREUM;
 
-uint256 constant BASE_18 = 1e18;
-uint256 constant BASE_9 = 1e9;
-
 uint256 constant BASE_GAS = 100000;
 uint256 constant GAS_MULTIPLIER = 150000; // 1.5x
 
diff --git a/scripts/Interfaces.s.sol b/scripts/Interfaces.s.sol
index cd17f8e..d79bb00 100644
--- a/scripts/Interfaces.s.sol
+++ b/scripts/Interfaces.s.sol
@@ -84,5 +84,5 @@ interface ILayerZeroBridge {
 
     function treasury() external view returns (address);
 
-    function lzEndpoint() external view returns (address);
+    function lzEndPoint() external view returns (address);
 }
diff --git a/scripts/Utils.s.sol b/scripts/Utils.s.sol
index 8a6292d..09f7b82 100644
--- a/scripts/Utils.s.sol
+++ b/scripts/Utils.s.sol
@@ -8,11 +8,12 @@ import { ProposalSender } from "contracts/ProposalSender.sol";
 import { TimelockControllerWithCounter } from "contracts/TimelockControllerWithCounter.sol";
 import { ILayerZeroEndpoint } from "lz/lzApp/interfaces/ILayerZeroEndpoint.sol";
 import { ITreasury } from "borrow/interfaces/ITreasury.sol";
+import "utils/src/CommonUtils.sol";
 import "./Constants.s.sol";
 
 /// @title Utils
 /// @author Angle Labs, Inc.
-contract Utils is Script {
+contract Utils is Script, CommonUtils {
     mapping(uint256 => uint256) internal forkIdentifier;
     uint256 public arbitrumFork;
     uint256 public avalancheFork;
@@ -58,112 +59,6 @@ contract Utils is Script {
         forkIdentifier[CHAIN_LINEA] = lineaFork;
     }
 
-    function lzEndPoint(uint256 chainId) public returns (ILayerZeroEndpoint) {
-        // TODO temporary check if LZ updated their sdk
-        if (chainId == CHAIN_GNOSIS) {
-            return ILayerZeroEndpoint(0x9740FF91F1985D8d2B71494aE1A2f723bb3Ed9E4);
-        } else if (chainId == CHAIN_POLYGONZKEVM) {
-            return ILayerZeroEndpoint(0x9740FF91F1985D8d2B71494aE1A2f723bb3Ed9E4);
-        } else if (chainId == CHAIN_BASE) {
-            return ILayerZeroEndpoint(0xb6319cC6c8c27A8F5dAF0dD3DF91EA35C4720dd7);
-        } else if (chainId == CHAIN_CELO) {
-            return ILayerZeroEndpoint(0x3A73033C0b1407574C76BdBAc67f126f6b4a9AA9);
-        } else if (chainId == CHAIN_LINEA) {
-            return ILayerZeroEndpoint(0xb6319cC6c8c27A8F5dAF0dD3DF91EA35C4720dd7);
-        }
-
-        string[] memory cmd = new string[](3);
-        cmd[0] = "node";
-        cmd[1] = "utils/layerZeroEndpoint.js";
-        cmd[2] = vm.toString(chainId);
-
-        bytes memory res = vm.ffi(cmd);
-        if (res.length == 0) revert("Chain not supported");
-        return ILayerZeroEndpoint(address(bytes20(res)));
-    }
-
-    function _getALLContracts(uint256 chainId) internal returns (address[] memory allContracts) {
-        string[] memory cmd = new string[](3);
-        cmd[0] = "node";
-        cmd[1] = "utils/getAllContracts.js";
-        cmd[2] = vm.toString(chainId);
-
-        bytes memory res = vm.ffi(cmd);
-        // When process exit code is 1, it will return an empty bytes "0x"
-        if (res.length == 0) revert("Chain not supported");
-        allContracts = abi.decode(res, (address[]));
-    }
-
-    function _chainToContract(uint256 chainId, ContractType name) internal returns (address) {
-        string[] memory cmd = new string[](4);
-        cmd[0] = "node";
-        cmd[1] = "utils/contractAddress.js";
-        cmd[2] = vm.toString(chainId);
-
-        if (name == ContractType.AgEUR) cmd[3] = "agEUR";
-        else if (name == ContractType.AgUSD) cmd[3] = "agUSD";
-        else if (name == ContractType.AgEURLZ) cmd[3] = "agEURLz";
-        else if (name == ContractType.AgUSDLZ) cmd[3] = "agUSDLz";
-        else if (name == ContractType.Angle) cmd[3] = "angle";
-        else if (name == ContractType.AngleLZ) cmd[3] = "angleLz";
-        else if (name == ContractType.AngleDistributor) cmd[3] = "angleDistributor";
-        else if (name == ContractType.AngleMiddleman) cmd[3] = "angleMiddleman";
-        else if (name == ContractType.AngleRouter) cmd[3] = "angleRouter";
-        else if (name == ContractType.CoreBorrow) cmd[3] = "coreBorrow";
-        else if (name == ContractType.CoreMerkl) cmd[3] = "coreMerkl";
-        else if (name == ContractType.DistributionCreator) cmd[3] = "distributionCreator";
-        else if (name == ContractType.Distributor) cmd[3] = "distributor";
-        else if (name == ContractType.FeeDistributor) cmd[3] = "feeDistributor";
-        else if (name == ContractType.GaugeController) cmd[3] = "gaugeController";
-        else if (name == ContractType.Governor) cmd[3] = "governor";
-        else if (name == ContractType.GovernorMultisig) cmd[3] = "governorMultisig";
-        else if (name == ContractType.GuardianMultisig) cmd[3] = "guardianMultisig";
-        else if (name == ContractType.MerklMiddleman) cmd[3] = "merklMiddleman";
-        else if (name == ContractType.ProposalReceiver) cmd[3] = "proposalReceiver";
-        else if (name == ContractType.ProposalSender) cmd[3] = "proposalSender";
-        else if (name == ContractType.ProxyAdmin) cmd[3] = "proxyAdmin";
-        else if (name == ContractType.SmartWalletWhitelist) cmd[3] = "smartWalletWhitelist";
-        else if (name == ContractType.StEUR) cmd[3] = "stEUR";
-        else if (name == ContractType.StUSD) cmd[3] = "stUSD";
-        else if (name == ContractType.Timelock) cmd[3] = "timelock";
-        else if (name == ContractType.TransmuterAgEUR) cmd[3] = "transmuterAgEUR";
-        else if (name == ContractType.TransmuterAgUSD) cmd[3] = "transmuterAgUSD";
-        else if (name == ContractType.TreasuryAgEUR) cmd[3] = "treasuryAgEUR";
-        else if (name == ContractType.TreasuryAgUSD) cmd[3] = "treasuryAgUSD";
-        else if (name == ContractType.veANGLE) cmd[3] = "veANGLE";
-        else if (name == ContractType.veBoost) cmd[3] = "veBoost";
-        else if (name == ContractType.veBoostProxy) cmd[3] = "veBoostProxy";
-        else revert("contract not supported");
-
-        bytes memory res = vm.ffi(cmd);
-        // When process exit code is 1, it will return an empty bytes "0x"
-        if (res.length == 0) revert("Chain not supported");
-        return address(bytes20(res));
-    }
-
-    function stringToUint(string memory s) public pure returns (uint) {
-        bytes memory b = bytes(s);
-        uint result = 0;
-        for (uint256 i = 0; i < b.length; i++) {
-            uint256 c = uint256(uint8(b[i]));
-            if (c >= 48 && c <= 57) {
-                result = result * 10 + (c - 48);
-            }
-        }
-        return result;
-    }
-
-    function getLZChainId(uint256 chainId) internal returns (uint16) {
-        string[] memory cmd = new string[](3);
-        cmd[0] = "node";
-        cmd[1] = "utils/layerZeroChainIds.js";
-        cmd[2] = vm.toString(chainId);
-
-        bytes memory res = vm.ffi(cmd);
-        if (res.length == 0) revert("Chain not supported");
-        return uint16(stringToUint(string(res)));
-    }
-
     function _deserializeJson()
         internal
         returns (bytes[] memory, string memory, address[] memory, uint256[] memory, uint256[] memory)
@@ -264,67 +159,4 @@ contract Utils is Script {
         string memory path = string.concat(root, pathProposal);
         vm.writeJson(output, path);
     }
-
-    function slice(bytes memory _bytes, uint256 _start, uint256 _length) internal pure returns (bytes memory) {
-        require(_length + 31 >= _length, "slice_overflow");
-        require(_bytes.length >= _start + _length, "slice_outOfBounds");
-
-        bytes memory tempBytes;
-
-        // Check length is 0. `iszero` return 1 for `true` and 0 for `false`.
-        assembly {
-            switch iszero(_length)
-            case 0 {
-                // Get a location of some free memory and store it in tempBytes as
-                // Solidity does for memory variables.
-                tempBytes := mload(0x40)
-
-                // Calculate length mod 32 to handle slices that are not a multiple of 32 in size.
-                let lengthmod := and(_length, 31)
-
-                // tempBytes will have the following format in memory: <length><data>
-                // When copying data we will offset the start forward to avoid allocating additional memory
-                // Therefore part of the length area will be written, but this will be overwritten later anyways.
-                // In case no offset is require, the start is set to the data region (0x20 from the tempBytes)
-                // mc will be used to keep track where to copy the data to.
-                let mc := add(add(tempBytes, lengthmod), mul(0x20, iszero(lengthmod)))
-                let end := add(mc, _length)
-
-                for {
-                    // Same logic as for mc is applied and additionally the start offset specified for the method is added
-                    let cc := add(add(add(_bytes, lengthmod), mul(0x20, iszero(lengthmod))), _start)
-                } lt(mc, end) {
-                    // increase `mc` and `cc` to read the next word from memory
-                    mc := add(mc, 0x20)
-                    cc := add(cc, 0x20)
-                } {
-                    // Copy the data from source (cc location) to the slice data (mc location)
-                    mstore(mc, mload(cc))
-                }
-
-                // Store the length of the slice. This will overwrite any partial data that
-                // was copied when having slices that are not a multiple of 32.
-                mstore(tempBytes, _length)
-
-                // update free-memory pointer
-                // allocating the array padded to 32 bytes like the compiler does now
-                // To set the used memory as a multiple of 32, add 31 to the actual memory usage (mc)
-                // and remove the modulo 32 (the `and` with `not(31)`)
-                mstore(0x40, and(add(mc, 31), not(31)))
-            }
-            // if we want a zero-length slice let's just return a zero-length array
-            default {
-                tempBytes := mload(0x40)
-                // zero out the 32 bytes slice we are about to return
-                // we need to do it because Solidity does not garbage collect
-                mstore(tempBytes, 0)
-
-                // update free-memory pointer
-                // tempBytes uses 32 bytes in memory (even when empty) for the length.
-                mstore(0x40, add(tempBytes, 0x20))
-            }
-        }
-
-        return tempBytes;
-    }
 }
diff --git a/scripts/deployment/DeployOnChainGovernance.s.sol b/scripts/deployment/DeployOnChainGovernance.s.sol
index 8cca756..73065ab 100644
--- a/scripts/deployment/DeployOnChainGovernance.s.sol
+++ b/scripts/deployment/DeployOnChainGovernance.s.sol
@@ -66,7 +66,7 @@ contract DeployOnChainGovernance is Utils {
         timelock.grantRole(timelock.PROPOSER_ROLE(), address(angleGovernor));
         timelock.grantRole(timelock.CANCELLER_ROLE(), safeMultiSig);
         timelock.renounceRole(timelock.DEFAULT_ADMIN_ROLE(), address(deployer));
-        proposalSenderDeployed = new ProposalSender(lzEndPoint(srcChainId));
+        proposalSenderDeployed = new ProposalSender(_lzEndPoint(srcChainId));
         proposalSenderDeployed.transferOwnership(address(angleGovernor));
         vm.stopBroadcast();
     }
diff --git a/scripts/deployment/DeploySideChainGovernance.s.sol b/scripts/deployment/DeploySideChainGovernance.s.sol
index 510baad..2912796 100644
--- a/scripts/deployment/DeploySideChainGovernance.s.sol
+++ b/scripts/deployment/DeploySideChainGovernance.s.sol
@@ -41,20 +41,20 @@ contract DeploySideChainGovernance is Utils {
         executors[0] = destSafeMultiSig; // Means everyone can execute
 
         // timelock = new TimelockControllerWithCounter(timelockDelay, proposers, executors, deployer);
-        // proposalReceiver = new ProposalReceiver(address(lzEndPoint(destChainId)));
+        // proposalReceiver = new ProposalReceiver(address(_lzEndPoint(destChainId)));
         timelock = TimelockControllerWithCounter(payable(0xd23B51d6F2cB3eC7ca9599D4332a2F10C3CFDF85));
         proposalReceiver = ProposalReceiver(payable(0x4A44f77978Daa3E92Eb3D97210bd11645cF935Ab));
         timelock.grantRole(timelock.PROPOSER_ROLE(), address(proposalReceiver));
         timelock.grantRole(timelock.CANCELLER_ROLE(), destSafeMultiSig);
         timelock.renounceRole(timelock.DEFAULT_ADMIN_ROLE(), deployer);
 
-        proposalReceiver.setTrustedRemoteAddress(getLZChainId(srcChainId), abi.encodePacked(proposalSender));
+        proposalReceiver.setTrustedRemoteAddress(_getLZChainId(srcChainId), abi.encodePacked(proposalSender));
         proposalReceiver.transferOwnership(address(timelock));
 
         vm.stopBroadcast();
 
         // TODO to connect both chains - governance need to approve this relayer receiver on native chain
         // vm.selectFork(srcChainId);
-        // proposalSender.setTrustedRemoteAddress(getLZChainId(destChainId), abi.encodePacked(proposalReceiver));
+        // proposalSender.setTrustedRemoteAddress(_getLZChainId(destChainId), abi.encodePacked(proposalReceiver));
     }
 }
diff --git a/scripts/interaction/CheckRoles.s.sol b/scripts/interaction/CheckRoles.s.sol
index 16343e3..d7f9157 100644
--- a/scripts/interaction/CheckRoles.s.sol
+++ b/scripts/interaction/CheckRoles.s.sol
@@ -53,7 +53,7 @@ contract CheckRoles is Utils {
     function _checkRoles(uint256 chainId) public {
         vm.selectFork(forkIdentifier[chainId]);
 
-        allContracts = _getALLContracts(chainId);
+        allContracts = _getAllContracts(chainId);
         // Address to check roles for
         uint256 nbrActors = chainId == CHAIN_ETHEREUM ? 11 : 10;
         address[] memory listAddressToCheck = new address[](nbrActors);
@@ -286,8 +286,8 @@ contract CheckRoles is Utils {
             if (token.treasury() != _chainToContract(chainId, contractTypeTreasury))
                 console.log(string.concat(nameToken, "  - wrong treasury: ", vm.toString(token.treasury())));
         }
-        if (token.lzEndpoint() != address(lzEndPoint(chainId)))
-            console.log(string.concat(nameToken, "  - wrong endpoint: ", vm.toString(address(token.lzEndpoint()))));
+        if (token.lzEndPoint() != address(_lzEndPoint(chainId)))
+            console.log(string.concat(nameToken, "  - wrong endpoint: ", vm.toString(address(token.lzEndPoint()))));
     }
 
     function _checkVaultManagers(uint256 chainId, ContractType treasuryType) internal {
diff --git a/scripts/interaction/CrossChainProposal.s.sol b/scripts/interaction/CrossChainProposal.s.sol
index b4e23c7..8b8be5f 100644
--- a/scripts/interaction/CrossChainProposal.s.sol
+++ b/scripts/interaction/CrossChainProposal.s.sol
@@ -70,7 +70,7 @@ contract CrossChainProposal is Utils {
         values[0] = feeLZ;
         calldatas[0] = abi.encodeWithSelector(
             sender.execute.selector,
-            getLZChainId(destChainId),
+            _getLZChainId(destChainId),
             abi.encode(timelockTargets, timelockValues, new string[](1), timelockCalldatas),
             abi.encodePacked(uint16(1), uint256(300000))
         );
diff --git a/scripts/interaction/ProposalReceiverConnect.s.sol b/scripts/interaction/ProposalReceiverConnect.s.sol
index 10bae32..17554ab 100644
--- a/scripts/interaction/ProposalReceiverConnect.s.sol
+++ b/scripts/interaction/ProposalReceiverConnect.s.sol
@@ -34,7 +34,7 @@ contract ProposalReceiverConnect is Utils {
         values[0] = 0;
         calldatas[0] = abi.encodeWithSelector(
             sender.setTrustedRemoteAddress.selector,
-            getLZChainId(destChainId),
+            _getLZChainId(destChainId),
             abi.encodePacked(receiver)
         );
 
diff --git a/scripts/interaction/ProposalSenderRetry.s.sol b/scripts/interaction/ProposalSenderRetry.s.sol
index 013a3ed..7bdc76d 100644
--- a/scripts/interaction/ProposalSenderRetry.s.sol
+++ b/scripts/interaction/ProposalSenderRetry.s.sol
@@ -24,6 +24,6 @@ contract ProposalSenderRetry is Utils {
         bytes
             memory payload = hex"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000000010000000000000000000000001305d45d583378d38fa614bbd9b45d6a0704690d000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002c48f2a0bb000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012c00000000000000000000000000000000000000000000000000000000000000020000000000000000000000001305d45d583378d38fa614bbd9b45d6a0704690d0000000000000000000000001305d45d583378d38fa614bbd9b45d6a0704690d0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000002464d6235300000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000442f2ff15dd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63000000000000000000000000fda462548ce04282f4b6d6619823a7c64fdc01850000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
         bytes memory adapterParams = abi.encodePacked(uint16(1), uint256(300000));
-        sender.retryExecute{ value: 1 ether }(1, getLZChainId(destChainId), payload, adapterParams, 0.01 ether);
+        sender.retryExecute{ value: 1 ether }(1, _getLZChainId(destChainId), payload, adapterParams, 0.01 ether);
     }
 }
diff --git a/scripts/proposals/Propose.s.sol b/scripts/proposals/Propose.s.sol
index f604970..f82f0ab 100644
--- a/scripts/proposals/Propose.s.sol
+++ b/scripts/proposals/Propose.s.sol
@@ -31,6 +31,7 @@ contract Propose is Utils {
         vm.rememberKey(deployerPrivateKey);
 
         vm.startBroadcast(deployerPrivateKey);
+
         AngleGovernor governor = AngleGovernor(payable(_chainToContract(CHAIN_SOURCE, ContractType.Governor)));
         uint256 proposalId = governor.propose(targets, values, calldatas, description);
         console.log("Proposal id: %d", proposalId);
diff --git a/scripts/proposals/Wrapper.s.sol b/scripts/proposals/Wrapper.s.sol
index 79db87c..d91a590 100644
--- a/scripts/proposals/Wrapper.s.sol
+++ b/scripts/proposals/Wrapper.s.sol
@@ -126,10 +126,10 @@ contract Wrapper is Utils {
         address sender = _chainToContract(CHAIN_SOURCE, ContractType.ProposalSender);
         address receiver = _chainToContract(chainId, ContractType.ProposalReceiver);
 
-        vm.prank(address(lzEndPoint(chainId)));
+        vm.prank(address(_lzEndPoint(chainId)));
         uint256 startGas = gasleft();
         ProposalReceiver(payable(receiver)).lzReceive(
-            getLZChainId(CHAIN_SOURCE),
+            _getLZChainId(CHAIN_SOURCE),
             abi.encodePacked(sender, receiver),
             0,
             abi.encode(targets, values, new string[](1), calldatas)
@@ -192,7 +192,7 @@ contract Wrapper is Utils {
                         GAS_MULTIPLIER) / BASE_GAS;
                     payload = abi.encodeWithSelector(
                         ProposalSender.execute.selector,
-                        getLZChainId(chainId),
+                        _getLZChainId(chainId),
                         abi.encode(batchTargets, batchValues, new string[](1), batchCalldatas),
                         abi.encodePacked(uint16(1), gasNeeded)
                     );
@@ -202,8 +202,8 @@ contract Wrapper is Utils {
                 calldatas[finalPropLength] = payload;
 
                 vm.selectFork(forkIdentifier[CHAIN_SOURCE]);
-                (uint256 nativeFee, ) = ILayerZeroEndpoint(lzEndPoint(CHAIN_SOURCE)).estimateFees(
-                    getLZChainId(chainId),
+                (uint256 nativeFee, ) = ILayerZeroEndpoint(_lzEndPoint(CHAIN_SOURCE)).estimateFees(
+                    _getLZChainId(chainId),
                     _chainToContract(CHAIN_SOURCE, ContractType.ProposalSender),
                     payload,
                     false,
diff --git a/scripts/proposals/layerzeroRelayers/ProposalSenderConnect.s.sol b/scripts/proposals/layerzeroRelayers/ProposalSenderConnect.s.sol
index d0937bd..1218b3c 100644
--- a/scripts/proposals/layerzeroRelayers/ProposalSenderConnect.s.sol
+++ b/scripts/proposals/layerzeroRelayers/ProposalSenderConnect.s.sol
@@ -15,7 +15,7 @@ contract ProposalSenderConnect is Wrapper {
             0,
             abi.encodeWithSelector(
                 ProposalSender.setTrustedRemoteAddress.selector,
-                getLZChainId(chainId),
+                _getLZChainId(chainId),
                 abi.encodePacked(receiver)
             )
         );
diff --git a/test/scripts/ScriptHelpers.t.sol b/test/scripts/ScriptHelpers.t.sol
index 689e488..bf09152 100644
--- a/test/scripts/ScriptHelpers.t.sol
+++ b/test/scripts/ScriptHelpers.t.sol
@@ -40,7 +40,7 @@ contract ScriptHelpers is Test, Utils {
         for (uint256 i; i < ALL_CHAINS.length; i++) {
             uint256 chainId = ALL_CHAINS[i];
             proposalSender.setTrustedRemoteAddress(
-                getLZChainId(chainId),
+                _getLZChainId(chainId),
                 abi.encodePacked(_chainToContract(chainId, ContractType.ProposalReceiver))
             );
         }
@@ -100,7 +100,7 @@ contract ScriptHelpers is Test, Utils {
                         for (uint256 i; i < entries.length; i++) {
                             if (
                                 entries[i].topics[0] == keccak256("ExecuteRemoteProposal(uint16,bytes)") &&
-                                entries[i].topics[1] == bytes32(uint256(getLZChainId(chainId)))
+                                entries[i].topics[1] == bytes32(uint256(_getLZChainId(chainId)))
                             ) {
                                 payload = abi.decode(entries[i].data, (bytes));
                                 break;
@@ -109,9 +109,9 @@ contract ScriptHelpers is Test, Utils {
                     }
 
                     vm.selectFork(forkIdentifier[chainId]);
-                    hoax(address(lzEndPoint(chainId)));
+                    hoax(address(_lzEndPoint(chainId)));
                     proposalReceiver.lzReceive(
-                        getLZChainId(CHAIN_SOURCE),
+                        _getLZChainId(CHAIN_SOURCE),
                         abi.encodePacked(proposalSender, proposalReceiver),
                         0,
                         payload
@@ -125,7 +125,7 @@ contract ScriptHelpers is Test, Utils {
                     console.logBytes(calldatas[chainCount]);
                     (, bytes memory senderData, ) = abi.decode(
                         // calldatas[chainCount],
-                        slice(calldatas[chainCount], 4, calldatas[chainCount].length - 4),
+                        _slice(calldatas[chainCount], 4, calldatas[chainCount].length - 4),
                         (uint16, bytes, bytes)
                     );
                     console.logBytes(senderData);
@@ -152,9 +152,9 @@ contract ScriptHelpers is Test, Utils {
         // We only consider when transaction is sent to the chain timelock, as the other case shouldn't ask for another execute call
         if (target == address(timelock)) {
             vm.prank(_chainToContract(chainId, ContractType.GuardianMultisig));
-            if (TimelockControllerWithCounter.schedule.selector == bytes4(slice(rawData, 0, 4))) {
+            if (TimelockControllerWithCounter.schedule.selector == bytes4(_slice(rawData, 0, 4))) {
                 (address target, uint256 value, bytes memory data, bytes32 predecessor, bytes32 salt, ) = abi.decode(
-                    slice(rawData, 4, rawData.length - 4),
+                    _slice(rawData, 4, rawData.length - 4),
                     (address, uint256, bytes, bytes32, bytes32, uint256)
                 );
                 timelock.execute(target, value, data, predecessor, salt);
@@ -167,7 +167,7 @@ contract ScriptHelpers is Test, Utils {
                     bytes32 salt,
 
                 ) = abi.decode(
-                        slice(rawData, 4, rawData.length - 4),
+                        _slice(rawData, 4, rawData.length - 4),
                         (address[], uint256[], bytes[], bytes32, bytes32, uint256)
                     );
                 timelock.executeBatch(tmpTargets, tmpValues, tmpCalldatas, predecessor, salt);
diff --git a/test/scripts/layerzeroRelayers/ProposalSenderConnectTest.t.sol b/test/scripts/layerzeroRelayers/ProposalSenderConnectTest.t.sol
index 9fb0a4d..727040b 100644
--- a/test/scripts/layerzeroRelayers/ProposalSenderConnectTest.t.sol
+++ b/test/scripts/layerzeroRelayers/ProposalSenderConnectTest.t.sol
@@ -45,8 +45,8 @@ contract ProposalSenderConnectTest is ScriptHelpers {
             uint256 chainId = chainIds[i];
 
             address receiver = _chainToContract(chainId, ContractType.ProposalReceiver);
-            bytes memory trustedRemote = sender.trustedRemoteLookup(getLZChainId(chainId));
-            address connectedReceiver = address(bytes20(slice(trustedRemote, 0, 20)));
+            bytes memory trustedRemote = sender.trustedRemoteLookup(_getLZChainId(chainId));
+            address connectedReceiver = address(bytes20(_slice(trustedRemote, 0, 20)));
             assertEq(receiver, connectedReceiver);
         }
     }
diff --git a/test/unit/ProposalLayerZeroRelayer.t.sol b/test/unit/ProposalLayerZeroRelayer.t.sol
index d82d8c8..53607a1 100644
--- a/test/unit/ProposalLayerZeroRelayer.t.sol
+++ b/test/unit/ProposalLayerZeroRelayer.t.sol
@@ -33,8 +33,8 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         uint256 srcChain = 1;
         uint256 destChain = 10;
         vm.selectFork(forkIdentifier[destChain]);
-        ProposalReceiver newReceiverOptimism = new ProposalReceiver(address(lzEndPoint(destChain)));
-        newReceiverOptimism.setTrustedRemoteAddress(getLZChainId(srcChain), abi.encodePacked(proposalSender()));
+        ProposalReceiver newReceiverOptimism = new ProposalReceiver(address(_lzEndPoint(destChain)));
+        newReceiverOptimism.setTrustedRemoteAddress(_getLZChainId(srcChain), abi.encodePacked(proposalSender()));
         newReceiverOptimism.transferOwnership(address(timelock(destChain)));
 
         {
@@ -72,7 +72,7 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         values[0] = 0;
         calldatas[0] = abi.encodeWithSelector(
             proposalSender().setTrustedRemoteAddress.selector,
-            getLZChainId(destChain),
+            _getLZChainId(destChain),
             abi.encodePacked(address(newReceiverOptimism))
         );
 
@@ -81,12 +81,12 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
 
         vm.selectFork(forkIdentifier[srcChain]);
         assertEq(
-            proposalSender().trustedRemoteLookup(getLZChainId(destChain)),
+            proposalSender().trustedRemoteLookup(_getLZChainId(destChain)),
             abi.encodePacked(address(proposalReceiver(destChain)), address(proposalSender()))
         );
         governor().execute(targets, values, calldatas, keccak256(bytes(description)));
         assertEq(
-            proposalSender().trustedRemoteLookup(getLZChainId(destChain)),
+            proposalSender().trustedRemoteLookup(_getLZChainId(destChain)),
             abi.encodePacked(address(newReceiverOptimism), address(proposalSender()))
         );
 
@@ -159,9 +159,9 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         string memory description = "Updating sendVersion on Mainnet";
 
         _shortcutProposal(1, description, targets, values, calldatas);
-        assertEq(lzEndPoint(1).getSendVersion(address(proposalSender())), defaultVersion);
+        assertEq(_lzEndPoint(1).getSendVersion(address(proposalSender())), defaultVersion);
         governor().execute(targets, values, calldatas, keccak256(bytes(description)));
-        assertEq(lzEndPoint(1).getSendVersion(address(proposalSender())), 1);
+        assertEq(_lzEndPoint(1).getSendVersion(address(proposalSender())), 1);
     }
 
     function test_RevertWhen_lzEndpointFail() public {
@@ -176,8 +176,8 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.selectFork(forkIdentifier[1]);
         // Making the call revert to force replay
         vm.mockCallRevert(
-            address(lzEndPoint(1)),
-            abi.encodeWithSelector(lzEndPoint(1).send.selector),
+            address(_lzEndPoint(1)),
+            abi.encodeWithSelector(_lzEndPoint(1).send.selector),
             abi.encode("REVERT")
         );
         assertEq(uint256(proposalSender().lastStoredPayloadNonce()), 0);
@@ -186,18 +186,18 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         bytes
             memory payload = hex"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a0cb889707d426a7a386870a03bc70d1b06975980000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a000000000000000000000000a0cb889707d426a7a386870a03bc70d1b0697598000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d6235300000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
         bytes memory adapterParams = abi.encodePacked(uint16(1), uint256(300000));
-        (uint nativeFee, uint zroFee) = proposalSender().estimateFees(getLZChainId(137), payload, adapterParams);
+        (uint nativeFee, uint zroFee) = proposalSender().estimateFees(_getLZChainId(137), payload, adapterParams);
         assertEq(zroFee, 0);
         assertGt(nativeFee, 0);
         assertLe(nativeFee, 0.1 ether);
-        bytes memory execution = abi.encode(getLZChainId(137), payload, adapterParams, 0.1 ether);
+        bytes memory execution = abi.encode(_getLZChainId(137), payload, adapterParams, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(1), keccak256(execution));
     }
 
     function test_RevertWhen_NoFailTx() public {
         uint64 nonce = 0;
         vm.expectRevert(abi.encodeWithSelector(Errors.OmnichainProposalSenderNoStoredPayload.selector));
-        proposalSender().retryExecute(nonce, getLZChainId(137), hex"", hex"", 1);
+        proposalSender().retryExecute(nonce, _getLZChainId(137), hex"", hex"", 1);
     }
 
     function test_RevertWhen_RetryExecuteWrongParams() public {
@@ -212,13 +212,13 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.selectFork(forkIdentifier[1]);
         // Making the call revert to force replay
         vm.mockCallRevert(
-            address(lzEndPoint(1)),
-            abi.encodeWithSelector(lzEndPoint(1).send.selector),
+            address(_lzEndPoint(1)),
+            abi.encodeWithSelector(_lzEndPoint(1).send.selector),
             abi.encode("REVERT")
         );
         _dummyProposal(1, p, description, 0.1 ether, hex"");
         vm.expectRevert(abi.encodeWithSelector(Errors.OmnichainProposalSenderInvalidExecParams.selector));
-        proposalSender().retryExecute(1, getLZChainId(137), hex"", hex"", 1);
+        proposalSender().retryExecute(1, _getLZChainId(137), hex"", hex"", 1);
     }
 
     function test_RetryExecuteSimple() public {
@@ -236,27 +236,27 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.selectFork(forkIdentifier[srcChain]);
         // Making the call revert to force replay
         vm.mockCallRevert(
-            address(lzEndPoint(srcChain)),
-            abi.encodeWithSelector(lzEndPoint(srcChain).send.selector),
+            address(_lzEndPoint(srcChain)),
+            abi.encodeWithSelector(_lzEndPoint(srcChain).send.selector),
             abi.encode("REVERT")
         );
         bytes
             memory payload = hex"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a0cb889707d426a7a386870a03bc70d1b06975980000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a000000000000000000000000a0cb889707d426a7a386870a03bc70d1b0697598000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d6235300000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
         bytes memory adapterParams = abi.encodePacked(uint16(1), uint256(300000));
-        (uint256 nativeFee, ) = proposalSender().estimateFees(getLZChainId(destChain), payload, adapterParams);
+        (uint256 nativeFee, ) = proposalSender().estimateFees(_getLZChainId(destChain), payload, adapterParams);
         assertLe(nativeFee, 0.1 ether);
         _dummyProposal(srcChain, p, description, 0.1 ether, hex"");
         vm.clearMockedCalls();
         // We need to execute with an address to get the eth refund
         vm.startPrank(alice);
-        proposalSender().retryExecute(1, getLZChainId(destChain), payload, adapterParams, 0.1 ether);
+        proposalSender().retryExecute(1, _getLZChainId(destChain), payload, adapterParams, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(1), bytes32(0));
         vm.stopPrank();
 
         vm.selectFork(forkIdentifier[destChain]);
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(srcChain),
+            _getLZChainId(srcChain),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload
@@ -287,8 +287,8 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.selectFork(forkIdentifier[1]);
         // Making the call revert to force replay
         vm.mockCallRevert(
-            address(lzEndPoint(1)),
-            abi.encodeWithSelector(lzEndPoint(1).send.selector),
+            address(_lzEndPoint(1)),
+            abi.encodeWithSelector(_lzEndPoint(1).send.selector),
             abi.encode("REVERT")
         );
         bytes
@@ -316,17 +316,17 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.clearMockedCalls();
         // We need to execute with an address to get the eth refund
         vm.prank(alice);
-        proposalSender().retryExecute(1, getLZChainId(destChain), payload1, adapterParams1, 0.1 ether);
+        proposalSender().retryExecute(1, _getLZChainId(destChain), payload1, adapterParams1, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(1), bytes32(0));
 
         vm.prank(alice);
-        proposalSender().retryExecute(2, getLZChainId(destChain), payload2, adapterParams2, 0.1 ether);
+        proposalSender().retryExecute(2, _getLZChainId(destChain), payload2, adapterParams2, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(2), bytes32(0));
 
         vm.selectFork(forkIdentifier[destChain]);
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload1
@@ -345,9 +345,9 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
             assertEq(timelock(destChain).getMinDelay() == 100, true);
         }
 
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload2
@@ -379,8 +379,8 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.selectFork(forkIdentifier[1]);
         // Making the call revert to force replay
         vm.mockCallRevert(
-            address(lzEndPoint(1)),
-            abi.encodeWithSelector(lzEndPoint(1).send.selector),
+            address(_lzEndPoint(1)),
+            abi.encodeWithSelector(_lzEndPoint(1).send.selector),
             abi.encode("REVERT")
         );
         bytes
@@ -408,17 +408,17 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.clearMockedCalls();
         // We need to execute with an address to get the eth refund
         vm.prank(alice);
-        proposalSender().retryExecute(1, getLZChainId(destChain), payload1, adapterParams1, 0.1 ether);
+        proposalSender().retryExecute(1, _getLZChainId(destChain), payload1, adapterParams1, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(1), bytes32(0));
 
         vm.prank(alice);
-        proposalSender().retryExecute(2, getLZChainId(destChain), payload2, adapterParams2, 0.1 ether);
+        proposalSender().retryExecute(2, _getLZChainId(destChain), payload2, adapterParams2, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(2), bytes32(0));
 
         vm.selectFork(forkIdentifier[destChain]);
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload2
@@ -437,9 +437,9 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
             assertEq(timelock(destChain).hasRole(timelock(destChain).PROPOSER_ROLE(), alice), true);
         }
 
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload1
@@ -471,8 +471,8 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.selectFork(forkIdentifier[1]);
         // Making the call revert to force replay
         vm.mockCallRevert(
-            address(lzEndPoint(1)),
-            abi.encodeWithSelector(lzEndPoint(1).send.selector),
+            address(_lzEndPoint(1)),
+            abi.encodeWithSelector(_lzEndPoint(1).send.selector),
             abi.encode("REVERT")
         );
         bytes
@@ -500,17 +500,17 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.clearMockedCalls();
         // We need to execute with an address to get the eth refund
         vm.prank(alice);
-        proposalSender().retryExecute(2, getLZChainId(destChain), payload2, adapterParams2, 0.1 ether);
+        proposalSender().retryExecute(2, _getLZChainId(destChain), payload2, adapterParams2, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(2), bytes32(0));
 
         vm.prank(alice);
-        proposalSender().retryExecute(1, getLZChainId(destChain), payload1, adapterParams1, 0.1 ether);
+        proposalSender().retryExecute(1, _getLZChainId(destChain), payload1, adapterParams1, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(1), bytes32(0));
 
         vm.selectFork(forkIdentifier[destChain]);
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload1
@@ -529,9 +529,9 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
             assertEq(timelock(destChain).getMinDelay() == 100, true);
         }
 
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload2
@@ -563,8 +563,8 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.selectFork(forkIdentifier[1]);
         // Making the call revert to force replay
         vm.mockCallRevert(
-            address(lzEndPoint(1)),
-            abi.encodeWithSelector(lzEndPoint(1).send.selector),
+            address(_lzEndPoint(1)),
+            abi.encodeWithSelector(_lzEndPoint(1).send.selector),
             abi.encode("REVERT")
         );
         bytes
@@ -592,17 +592,17 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.clearMockedCalls();
         // We need to execute with an address to get the eth refund
         vm.prank(alice);
-        proposalSender().retryExecute(2, getLZChainId(destChain), payload2, adapterParams2, 0.1 ether);
+        proposalSender().retryExecute(2, _getLZChainId(destChain), payload2, adapterParams2, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(2), bytes32(0));
 
         vm.prank(alice);
-        proposalSender().retryExecute(1, getLZChainId(destChain), payload1, adapterParams1, 0.1 ether);
+        proposalSender().retryExecute(1, _getLZChainId(destChain), payload1, adapterParams1, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(1), bytes32(0));
 
         vm.selectFork(forkIdentifier[destChain]);
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload2
@@ -621,9 +621,9 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
             assertEq(timelock(destChain).hasRole(timelock(destChain).PROPOSER_ROLE(), alice), true);
         }
 
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload1
@@ -665,8 +665,8 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.selectFork(forkIdentifier[1]);
         // Making the call revert to force replay
         vm.mockCallRevert(
-            address(lzEndPoint(1)),
-            abi.encodeWithSelector(lzEndPoint(1).send.selector),
+            address(_lzEndPoint(1)),
+            abi.encodeWithSelector(_lzEndPoint(1).send.selector),
             abi.encode("REVERT")
         );
         bytes
@@ -676,14 +676,14 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         vm.clearMockedCalls();
         // We need to execute with an address to get the eth refund
         vm.startPrank(alice);
-        proposalSender().retryExecute(1, getLZChainId(destChain), payload, adapterParams, 0.1 ether);
+        proposalSender().retryExecute(1, _getLZChainId(destChain), payload, adapterParams, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(1), bytes32(0));
         vm.stopPrank();
 
         vm.selectFork(forkIdentifier[destChain]);
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload
@@ -786,8 +786,8 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
 
     function test_PolygonUpdateProposalReceiver() public {
         vm.selectFork(forkIdentifier[137]);
-        ProposalReceiver proposalReceiver2 = new ProposalReceiver(address(lzEndPoint(137)));
-        proposalReceiver2.setTrustedRemoteAddress(getLZChainId(1), abi.encodePacked(_proposalSender));
+        ProposalReceiver proposalReceiver2 = new ProposalReceiver(address(_lzEndPoint(137)));
+        proposalReceiver2.setTrustedRemoteAddress(_getLZChainId(1), abi.encodePacked(_proposalSender));
         proposalReceiver2.transferOwnership(address(timelock(137)));
         address newProposalReceiver = address(proposalReceiver2);
 
@@ -820,7 +820,7 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
             value: 0,
             data: abi.encodeWithSelector(
                 proposalSender().setTrustedRemoteAddress.selector,
-                getLZChainId(137),
+                _getLZChainId(137),
                 abi.encodePacked(proposalReceiver2)
             )
         });
@@ -846,7 +846,7 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         for (uint256 i; i < entries.length; i++) {
             if (
                 entries[i].topics[0] == keccak256("ExecuteRemoteProposal(uint16,bytes)") &&
-                entries[i].topics[1] == bytes32(uint256(getLZChainId(137)))
+                entries[i].topics[1] == bytes32(uint256(_getLZChainId(137)))
             ) {
                 payload = abi.decode(entries[i].data, (bytes));
                 break;
@@ -854,9 +854,9 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         }
 
         vm.selectFork(forkIdentifier[137]);
-        hoax(address(lzEndPoint(137)));
+        hoax(address(_lzEndPoint(137)));
         proposalReceiver(137).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(137)),
             0,
             payload
@@ -892,22 +892,22 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         bytes
             memory payload = hex"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a0cb889707d426a7a386870a03bc70d1b06975980000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a000000000000000000000000a0cb889707d426a7a386870a03bc70d1b0697598000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d6235300000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
         bytes memory adapterParams = abi.encodePacked(uint16(1), uint256(300000));
-        bytes memory execution = abi.encode(getLZChainId(destChain), payload, adapterParams, 0.1 ether);
+        bytes memory execution = abi.encode(_getLZChainId(destChain), payload, adapterParams, 0.1 ether);
         vm.mockCallRevert(
             address(timelock(destChain)),
             abi.encodeWithSelector(timelock(destChain).schedule.selector),
             abi.encode(TimelockController.TimelockUnexpectedOperationState.selector, hex"", hex"01")
         );
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload
         );
         assertEq(
             proposalReceiver(destChain).failedMessages(
-                getLZChainId(1),
+                _getLZChainId(1),
                 abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
                 0
             ),
@@ -916,7 +916,7 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
 
         vm.expectRevert(Errors.OmnichainGovernanceExecutorTxExecReverted.selector);
         proposalReceiver(destChain).retryMessage(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload
@@ -925,7 +925,7 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
 
         assertEq(timelock(destChain).getMinDelay() != 100, true);
         proposalReceiver(destChain).retryMessage(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload
@@ -969,22 +969,22 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
         bytes
             memory payload = hex"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a0cb889707d426a7a386870a03bc70d1b06975980000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a000000000000000000000000a0cb889707d426a7a386870a03bc70d1b0697598000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d6235300000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
         bytes memory adapterParams = abi.encodePacked(uint16(1), uint256(300000));
-        bytes memory execution = abi.encode(getLZChainId(destChain), payload, adapterParams, 0.1 ether);
+        bytes memory execution = abi.encode(_getLZChainId(destChain), payload, adapterParams, 0.1 ether);
         vm.mockCallRevert(
             address(timelock(destChain)),
             abi.encodeWithSelector(timelock(destChain).schedule.selector),
             abi.encode(TimelockController.TimelockUnexpectedOperationState.selector, hex"", hex"01")
         );
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             1,
             payload
         );
         assertEq(
             proposalReceiver(destChain).failedMessages(
-                getLZChainId(1),
+                _getLZChainId(1),
                 abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
                 1
             ),
@@ -993,7 +993,7 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
 
         vm.expectRevert(Errors.OmnichainGovernanceExecutorTxExecReverted.selector);
         proposalReceiver(destChain).retryMessage(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             1,
             payload
@@ -1002,7 +1002,7 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
 
         assertEq(timelock(destChain).getMinDelay() != 100, true);
         proposalReceiver(destChain).retryMessage(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             1,
             payload
@@ -1054,9 +1054,9 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
             abi.encodeWithSelector(timelock(destChain).schedule.selector),
             abi.encode(TimelockController.TimelockUnexpectedOperationState.selector, hex"", hex"01")
         );
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             1,
             payload
@@ -1065,7 +1065,7 @@ contract ProposalLayerZeroRelayer is SimulationSetup {
 
         assertEq(timelock(destChain).getMinDelay() != oldDelay, true);
         proposalReceiver(destChain).retryMessage(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             1,
             payload
diff --git a/test/unit/Scenarios.t.sol b/test/unit/Scenarios.t.sol
index 8049532..5247327 100644
--- a/test/unit/Scenarios.t.sol
+++ b/test/unit/Scenarios.t.sol
@@ -132,7 +132,7 @@ contract Scenarios is SimulationSetup {
         for (uint256 i; i < entries.length; i++) {
             if (
                 entries[i].topics[0] == keccak256("ExecuteRemoteProposal(uint16,bytes)") &&
-                entries[i].topics[1] == bytes32(uint256(getLZChainId(137)))
+                entries[i].topics[1] == bytes32(uint256(_getLZChainId(137)))
             ) {
                 payload = abi.decode(entries[i].data, (bytes));
                 break;
@@ -140,9 +140,9 @@ contract Scenarios is SimulationSetup {
         }
 
         vm.selectFork(forkIdentifier[137]);
-        hoax(address(lzEndPoint(137)));
+        hoax(address(_lzEndPoint(137)));
         proposalReceiver(137).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(137)),
             0,
             payload
diff --git a/test/unit/Simulate.t.sol b/test/unit/Simulate.t.sol
index 98c720f..659dfd1 100644
--- a/test/unit/Simulate.t.sol
+++ b/test/unit/Simulate.t.sol
@@ -48,11 +48,11 @@ contract ProposalSimulateTest is SimulationSetup {
         for (uint256 i; i < entries.length; i++) {
             if (entries[i].topics[0] == keccak256("ExecuteRemoteProposal(uint16,bytes)")) {
                 bytes memory payload = abi.decode(entries[i].data, (bytes));
-                uint16 chainId = getChainId(uint16(uint256((entries[i].topics[1]))));
+                uint16 chainId = _getChainIdFromLZChainId(uint16(uint256((entries[i].topics[1]))));
                 vm.selectFork(forkIdentifier[chainId]);
-                hoax(address(lzEndPoint(chainId)));
+                hoax(address(_lzEndPoint(chainId)));
                 proposalReceiver(chainId).lzReceive(
-                    getLZChainId(1),
+                    _getLZChainId(1),
                     abi.encodePacked(proposalSender(), proposalReceiver(chainId)),
                     0,
                     payload
diff --git a/test/unit/SimulationSetup.t.sol b/test/unit/SimulationSetup.t.sol
index 331c9ac..bfb29c8 100644
--- a/test/unit/SimulationSetup.t.sol
+++ b/test/unit/SimulationSetup.t.sol
@@ -20,10 +20,12 @@ import { Proposal, SubCall } from "./Proposal.sol";
 import { ILayerZeroEndpoint } from "lz/lzApp/interfaces/ILayerZeroEndpoint.sol";
 import "stringutils/strings.sol";
 
+import "utils/src/CommonUtils.sol";
+
 import "../Constants.t.sol";
 
 //solhint-disable
-contract SimulationSetup is Test {
+contract SimulationSetup is Test, CommonUtils {
     using strings for *;
 
     Proposal proposal = new Proposal();
@@ -89,7 +91,7 @@ contract SimulationSetup is Test {
                 _timelocks[chainIds[i]].grantRole(_timelocks[chainIds[i]].PROPOSER_ROLE(), address(governor()));
                 _timelocks[chainIds[i]].grantRole(_timelocks[chainIds[i]].CANCELLER_ROLE(), multisig(chainIds[i]));
                 _timelocks[chainIds[i]].renounceRole(_timelocks[chainIds[i]].DEFAULT_ADMIN_ROLE(), address(this));
-                _proposalSender = new ProposalSender(lzEndPoint(chainIds[i]));
+                _proposalSender = new ProposalSender(_lzEndPoint(chainIds[i]));
             } else {
                 vm.selectFork(forkIdentifier[chainIds[i]]);
                 address[] memory proposers = new address[](0);
@@ -102,7 +104,7 @@ contract SimulationSetup is Test {
                     executors,
                     address(this)
                 );
-                _proposalReceivers[chainIds[i]] = new ProposalReceiver(address(lzEndPoint(chainIds[i])));
+                _proposalReceivers[chainIds[i]] = new ProposalReceiver(address(_lzEndPoint(chainIds[i])));
                 _timelocks[chainIds[i]].grantRole(
                     _timelocks[chainIds[i]].PROPOSER_ROLE(),
                     address(_proposalReceivers[chainIds[i]])
@@ -111,13 +113,13 @@ contract SimulationSetup is Test {
 
                 vm.selectFork(forkIdentifier[1]);
                 _proposalSender.setTrustedRemoteAddress(
-                    getLZChainId(chainIds[i]),
+                    _getLZChainId(chainIds[i]),
                     abi.encodePacked(_proposalReceivers[chainIds[i]])
                 );
 
                 vm.selectFork(forkIdentifier[chainIds[i]]);
                 _proposalReceivers[chainIds[i]].setTrustedRemoteAddress(
-                    getLZChainId(1),
+                    _getLZChainId(1),
                     abi.encodePacked(_proposalSender)
                 );
                 _proposalReceivers[chainIds[i]].transferOwnership(address(_timelocks[chainIds[i]]));
@@ -158,48 +160,6 @@ contract SimulationSetup is Test {
         return address(bytes20(res));
     }
 
-    function lzEndPoint(uint256 chainId) public returns (ILayerZeroEndpoint) {
-        string[] memory cmd = new string[](3);
-        cmd[0] = "node";
-        cmd[1] = "utils/layerZeroEndpoint.js";
-        cmd[2] = vm.toString(chainId);
-
-        bytes memory res = vm.ffi(cmd);
-        return ILayerZeroEndpoint(address(bytes20(res)));
-    }
-
-    function stringToUint(string memory s) public pure returns (uint) {
-        bytes memory b = bytes(s);
-        uint result = 0;
-        for (uint256 i = 0; i < b.length; i++) {
-            uint256 c = uint256(uint8(b[i]));
-            if (c >= 48 && c <= 57) {
-                result = result * 10 + (c - 48);
-            }
-        }
-        return result;
-    }
-
-    function getLZChainId(uint256 chainId) internal returns (uint16) {
-        string[] memory cmd = new string[](3);
-        cmd[0] = "node";
-        cmd[1] = "utils/layerZeroChainIds.js";
-        cmd[2] = vm.toString(chainId);
-
-        bytes memory res = vm.ffi(cmd);
-        return uint16(stringToUint(string(res)));
-    }
-
-    function getChainId(uint256 lzChainId) internal returns (uint16) {
-        string[] memory cmd = new string[](3);
-        cmd[0] = "node";
-        cmd[1] = "utils/chainIdFromLZChainIds.js";
-        cmd[2] = vm.toString(lzChainId);
-
-        bytes memory res = vm.ffi(cmd);
-        return uint16(stringToUint(string(res)));
-    }
-
     /*//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                                                         HELPERS                                                     
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
@@ -265,7 +225,7 @@ contract SimulationSetup is Test {
                 values[finalPropLength] = 0.1 ether;
                 calldatas[finalPropLength] = abi.encodeWithSelector(
                     proposalSender().execute.selector,
-                    getLZChainId(chainId),
+                    _getLZChainId(chainId),
                     abi.encode(batchTargets, batchValues, new string[](1), batchCalldatas),
                     abi.encodePacked(uint16(1), uint256(300000))
                 );
@@ -441,7 +401,7 @@ contract SimulationSetup is Test {
                 for (uint256 i; i < entries.length; i++) {
                     if (
                         entries[i].topics[0] == keccak256("ExecuteRemoteProposal(uint16,bytes)") &&
-                        entries[i].topics[1] == bytes32(uint256(getLZChainId(chainId)))
+                        entries[i].topics[1] == bytes32(uint256(_getLZChainId(chainId)))
                     ) {
                         payload = abi.decode(entries[i].data, (bytes));
                         break;
@@ -450,9 +410,9 @@ contract SimulationSetup is Test {
             }
 
             vm.selectFork(forkIdentifier[chainId]);
-            hoax(address(lzEndPoint(chainId)));
+            hoax(address(_lzEndPoint(chainId)));
             proposalReceiver(chainId).lzReceive(
-                getLZChainId(1),
+                _getLZChainId(1),
                 abi.encodePacked(proposalSender(), proposalReceiver(chainId)),
                 0,
                 payload
diff --git a/test/unit/TimelockControllerWithCounter.t.sol b/test/unit/TimelockControllerWithCounter.t.sol
index 773c045..9bdc1fc 100644
--- a/test/unit/TimelockControllerWithCounter.t.sol
+++ b/test/unit/TimelockControllerWithCounter.t.sol
@@ -83,8 +83,8 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         uint256 srcChain = 1;
         uint256 destChain = 10;
         vm.selectFork(forkIdentifier[destChain]);
-        ProposalReceiver newReceiverOptimism = new ProposalReceiver(address(lzEndPoint(destChain)));
-        newReceiverOptimism.setTrustedRemoteAddress(getLZChainId(srcChain), abi.encodePacked(proposalSender()));
+        ProposalReceiver newReceiverOptimism = new ProposalReceiver(address(_lzEndPoint(destChain)));
+        newReceiverOptimism.setTrustedRemoteAddress(_getLZChainId(srcChain), abi.encodePacked(proposalSender()));
         newReceiverOptimism.transferOwnership(address(timelock(destChain)));
 
         {
@@ -133,7 +133,7 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         values[0] = 0;
         calldatas[0] = abi.encodeWithSelector(
             proposalSender().setTrustedRemoteAddress.selector,
-            getLZChainId(destChain),
+            _getLZChainId(destChain),
             abi.encodePacked(address(newReceiverOptimism))
         );
 
@@ -142,12 +142,12 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
 
         vm.selectFork(forkIdentifier[srcChain]);
         assertEq(
-            proposalSender().trustedRemoteLookup(getLZChainId(destChain)),
+            proposalSender().trustedRemoteLookup(_getLZChainId(destChain)),
             abi.encodePacked(address(proposalReceiver(destChain)), address(proposalSender()))
         );
         governor().execute(targets, values, calldatas, keccak256(bytes(description)));
         assertEq(
-            proposalSender().trustedRemoteLookup(getLZChainId(destChain)),
+            proposalSender().trustedRemoteLookup(_getLZChainId(destChain)),
             abi.encodePacked(address(newReceiverOptimism), address(proposalSender()))
         );
 
@@ -195,20 +195,20 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         vm.selectFork(forkIdentifier[srcChain]);
         // Making the call revert to force replay
         vm.mockCallRevert(
-            address(lzEndPoint(srcChain)),
-            abi.encodeWithSelector(lzEndPoint(srcChain).send.selector),
+            address(_lzEndPoint(srcChain)),
+            abi.encodeWithSelector(_lzEndPoint(srcChain).send.selector),
             abi.encode("REVERT")
         );
         bytes
             memory payload = hex"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a0cb889707d426a7a386870a03bc70d1b06975980000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a000000000000000000000000a0cb889707d426a7a386870a03bc70d1b0697598000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d6235300000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
         bytes memory adapterParams = abi.encodePacked(uint16(1), uint256(300000));
-        (uint256 nativeFee, ) = proposalSender().estimateFees(getLZChainId(destChain), payload, adapterParams);
+        (uint256 nativeFee, ) = proposalSender().estimateFees(_getLZChainId(destChain), payload, adapterParams);
         assertLe(nativeFee, 0.1 ether);
         _dummyProposal(srcChain, p, description, 0.1 ether, hex"");
         vm.clearMockedCalls();
         // We need to execute with an address to get the eth refund
         vm.startPrank(alice);
-        proposalSender().retryExecute(1, getLZChainId(destChain), payload, adapterParams, 0.1 ether);
+        proposalSender().retryExecute(1, _getLZChainId(destChain), payload, adapterParams, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(1), bytes32(0));
         vm.stopPrank();
 
@@ -218,9 +218,9 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         assertEq(timelock(destChain).counterProposals(), 0);
         assertEq(timelock(destChain).proposalIds(0), 0);
 
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(srcChain),
+            _getLZChainId(srcChain),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload
@@ -265,8 +265,8 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         vm.selectFork(forkIdentifier[1]);
         // Making the call revert to force replay
         vm.mockCallRevert(
-            address(lzEndPoint(1)),
-            abi.encodeWithSelector(lzEndPoint(1).send.selector),
+            address(_lzEndPoint(1)),
+            abi.encodeWithSelector(_lzEndPoint(1).send.selector),
             abi.encode("REVERT")
         );
         bytes
@@ -294,11 +294,11 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         vm.clearMockedCalls();
         // We need to execute with an address to get the eth refund
         vm.prank(alice);
-        proposalSender().retryExecute(1, getLZChainId(destChain), payload1, adapterParams1, 0.1 ether);
+        proposalSender().retryExecute(1, _getLZChainId(destChain), payload1, adapterParams1, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(1), bytes32(0));
 
         vm.prank(alice);
-        proposalSender().retryExecute(2, getLZChainId(destChain), payload2, adapterParams2, 0.1 ether);
+        proposalSender().retryExecute(2, _getLZChainId(destChain), payload2, adapterParams2, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(2), bytes32(0));
 
         assertEq(timelock(1).counterProposals(), 0);
@@ -308,9 +308,9 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         assertEq(timelock(destChain).proposalIds(0), 0);
 
         vm.selectFork(forkIdentifier[destChain]);
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload1
@@ -342,9 +342,9 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         vm.selectFork(forkIdentifier[destChain]);
         assertEq(timelock(destChain).counterProposals(), 1);
 
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload2
@@ -384,8 +384,8 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         vm.selectFork(forkIdentifier[1]);
         // Making the call revert to force replay
         vm.mockCallRevert(
-            address(lzEndPoint(1)),
-            abi.encodeWithSelector(lzEndPoint(1).send.selector),
+            address(_lzEndPoint(1)),
+            abi.encodeWithSelector(_lzEndPoint(1).send.selector),
             abi.encode("REVERT")
         );
         bytes
@@ -413,11 +413,11 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         vm.clearMockedCalls();
         // We need to execute with an address to get the eth refund
         vm.prank(alice);
-        proposalSender().retryExecute(2, getLZChainId(destChain), payload2, adapterParams2, 0.1 ether);
+        proposalSender().retryExecute(2, _getLZChainId(destChain), payload2, adapterParams2, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(2), bytes32(0));
 
         vm.prank(alice);
-        proposalSender().retryExecute(1, getLZChainId(destChain), payload1, adapterParams1, 0.1 ether);
+        proposalSender().retryExecute(1, _getLZChainId(destChain), payload1, adapterParams1, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(1), bytes32(0));
 
         assertEq(timelock(1).counterProposals(), 0);
@@ -427,9 +427,9 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         assertEq(timelock(destChain).proposalIds(0), 0);
 
         vm.selectFork(forkIdentifier[destChain]);
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload2
@@ -461,9 +461,9 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         vm.selectFork(forkIdentifier[destChain]);
         assertEq(timelock(destChain).counterProposals(), 1);
 
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload1
@@ -512,8 +512,8 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         vm.selectFork(forkIdentifier[1]);
         // Making the call revert to force replay
         vm.mockCallRevert(
-            address(lzEndPoint(1)),
-            abi.encodeWithSelector(lzEndPoint(1).send.selector),
+            address(_lzEndPoint(1)),
+            abi.encodeWithSelector(_lzEndPoint(1).send.selector),
             abi.encode("REVERT")
         );
         bytes
@@ -523,7 +523,7 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         vm.clearMockedCalls();
         // We need to execute with an address to get the eth refund
         vm.startPrank(alice);
-        proposalSender().retryExecute(1, getLZChainId(destChain), payload, adapterParams, 0.1 ether);
+        proposalSender().retryExecute(1, _getLZChainId(destChain), payload, adapterParams, 0.1 ether);
         assertEq(proposalSender().storedExecutionHashes(1), bytes32(0));
         vm.stopPrank();
 
@@ -533,9 +533,9 @@ contract TimelockControllerWithCounterTest is SimulationSetup {
         assertEq(timelock(destChain).counterProposals(), 0);
         assertEq(timelock(destChain).proposalIds(0), 0);
 
-        hoax(address(lzEndPoint(destChain)));
+        hoax(address(_lzEndPoint(destChain)));
         proposalReceiver(destChain).lzReceive(
-            getLZChainId(1),
+            _getLZChainId(1),
             abi.encodePacked(proposalSender(), proposalReceiver(destChain)),
             0,
             payload
diff --git a/utils/chainIdFromLZChainIds.js b/utils/chainIdFromLZChainIds.js
deleted file mode 100755
index 1625f6e..0000000
--- a/utils/chainIdFromLZChainIds.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const { ChainListId, ChainId } = require('@layerzerolabs/lz-sdk');
-
-// Ensure an argument has been provided
-if (process.argv.length < 3) {
-  console.error('Please provide a chain input as an argument.');
-  process.exit(1);
-}
-
-// Get the argument from the command line input
-// process.argv[0] is the node command
-// process.argv[1] is the path to the runner.js file
-// process.argv[2] is the first argument provided by the user
-const chainInput = process.argv[2];
-
-// Try to parse the input as a number if possible
-const parsedInput = isNaN(Number(chainInput)) ? chainInput : Number(chainInput);
-
-// Call the function with the input
-const result = ChainListId[ChainId[parsedInput]];
-if(!result) process.exit(1);
-console.log(result);
diff --git a/utils/contractAddress.js b/utils/contractAddress.js
deleted file mode 100644
index 71bbc26..0000000
--- a/utils/contractAddress.js
+++ /dev/null
@@ -1,60 +0,0 @@
-const { registry } = require('@angleprotocol/sdk');
-const { ethers } = require('ethers');
-
-// Ensure an argument has been provided
-if (process.argv.length < 4) {
-  console.error('Please provide a chain input as an argument.');
-  process.exit(1);
-}
-
-// Get the argument from the command line input
-// process.argv[0] is the node command
-// process.argv[1] is the path to the runner.js file
-// process.argv[2] is the first argument provided by the user
-const chainInput = process.argv[2];
-const contracTtype = String(process.argv[3]);
-
-// Try to parse the input as a number if possible
-if(isNaN(Number(chainInput))) process.exit(1);
-const parsedInput = Number(chainInput);
-
-let contract
-
-if(contracTtype == "agEUR") contract = registry(parsedInput)?.agEUR?.AgToken;
-else if(contracTtype == "agUSD") contract = registry(parsedInput)?.agUSD?.AgToken;
-else if(contracTtype == "agEURLz") contract = registry(parsedInput)?.agEUR?.bridges.LayerZero;
-else if(contracTtype == "agUSDLz") contract = registry(parsedInput)?.agUSD?.bridges.LayerZero;
-else if(contracTtype == "angle") contract = registry(parsedInput)?.ANGLE;
-else if(contracTtype == "angleLz") contract = registry(parsedInput)?.bridges.LayerZero;
-else if(contracTtype == "angleDistributor") contract = registry(parsedInput)?.AngleDistributor;
-else if(contracTtype == "angleMiddleman") contract = registry(parsedInput)?.Middleman;
-else if(contracTtype == "angleRouter") contract = registry(parsedInput)?.AngleRouterV2;
-else if(contracTtype == "coreBorrow") contract = registry(parsedInput)?.CoreBorrow;
-else if(contracTtype == "coreMerkl") contract = registry(parsedInput)?.Merkl?.CoreMerkl;
-else if(contracTtype == "distributionCreator") contract = registry(parsedInput)?.Merkl?.DistributionCreator;
-else if(contracTtype == "distributor") contract = registry(parsedInput)?.Merkl?.Distributor;
-else if(contracTtype == "feeDistributor") contract = registry(parsedInput)?.FeeDistributor_sanUSDC_EUR;
-else if(contracTtype == "gaugeController") contract = registry(parsedInput)?.GaugeController;
-else if(contracTtype == "governor") contract =  registry(parsedInput)?.AngleGovernor;
-else if(contracTtype == "governorMultisig") contract = registry(parsedInput)?.Governor;
-else if(contracTtype == "guardianMultisig") contract =  registry(parsedInput)?.Guardian;
-else if(contracTtype == "merklMiddleman") contract = registry(parsedInput)?.MerklGaugeMiddleman;
-else if(contracTtype == "proposalReceiver")  contract = registry(parsedInput)?.ProposalReceiver;
-else if(contracTtype == "proposalSender") contract = registry(parsedInput)?.ProposalSender;
-else if(contracTtype == "proxyAdmin") contract = registry(parsedInput)?.ProxyAdmin;
-else if(contracTtype == "smartWalletWhitelist") contract = registry(parsedInput)?.SmartWalletWhitelist;
-else if(contracTtype == "stEUR") contract = registry(parsedInput)?.agEUR?.Savings;
-else if(contracTtype == "stUSD") contract = registry(parsedInput)?.agUSD?.Savings;
-else if(contracTtype == "timelock") contract = registry(parsedInput)?.Timelock;
-else if(contracTtype == "transmuterAgEUR") contract = registry(parsedInput)?.agEUR?.Transmuter;
-else if(contracTtype == "transmuterAgUSD") contract = registry(parsedInput)?.agUSD?.Transmuter;
-else if(contracTtype == "treasuryAgEUR") contract = registry(parsedInput)?.agEUR?.Treasury;
-else if(contracTtype == "treasuryAgUSD") contract = registry(parsedInput)?.agUSD?.Treasury;
-else if(contracTtype == "veANGLE") contract = registry(parsedInput)?.veANGLE;
-else if(contracTtype == "veBoost") contract = registry(parsedInput)?.veBoost;
-else if(contracTtype == "veBoostProxy") contract = registry(parsedInput)?.veBoostProxy;
-
-if(!contract) process.exit(1);
-// Call the function with the input
-const result = ethers.utils.getAddress(contract)?.toString()?.slice(2);
-console.log(result);
\ No newline at end of file
diff --git a/utils/forwardUtils.js b/utils/forwardUtils.js
new file mode 100755
index 0000000..237c7e0
--- /dev/null
+++ b/utils/forwardUtils.js
@@ -0,0 +1,22 @@
+const { exec } = require("child_process");
+
+if (process.argv.length < 3) {
+    console.error('Please provide a chain input as an argument.');
+    process.exit(1);
+}
+
+const command = process.argv[2];
+const extraArgs = process.argv.slice(3).join(' ');
+
+
+exec(`node lib/utils/utils/${command}.js ${extraArgs}`, (error, stdout, stderr) => {
+    if (error) {
+        console.log(error);
+        return;
+    }
+    if (stderr) {
+        console.log(stderr);
+        return;
+    }
+    console.log(stdout);
+});
\ No newline at end of file
diff --git a/utils/getAllContracts.js b/utils/getAllContracts.js
deleted file mode 100644
index 027461e..0000000
--- a/utils/getAllContracts.js
+++ /dev/null
@@ -1,41 +0,0 @@
-const { registry } = require('@angleprotocol/sdk');
-const { ethers } = require('ethers');
-
-// Ensure an argument has been provided
-if (process.argv.length < 3) {
-  console.error('Please provide a chain input as an argument.');
-  process.exit(1);
-}
-
-// Get the argument from the command line input
-// process.argv[0] is the node command
-// process.argv[1] is the path to the runner.js file
-// process.argv[2] is the first argument provided by the user
-const chainInput = process.argv[2];
-
-// Try to parse the input as a number if possible
-if(isNaN(Number(chainInput))) process.exit(1);
-const parsedInput = Number(chainInput);
-
-// Function to get all addresses from the registry
-function getAllAddresses(registry) {
-  let addresses = [];
-
-  for (let key in registry) {
-    if (typeof registry[key] === 'object' && registry[key] !== null) {
-      // If the value is a nested object, recursively get addresses
-      addresses = addresses.concat(getAllAddresses(registry[key]));
-    } else {
-      // If the value is not an object, assume it's an address and add to the list
-      addresses.push(ethers.utils.getAddress(registry[key])?.toString());
-    }
-  }
-
-  return addresses;
-}
-
-// Call the function with the registry
-let allAddresses = getAllAddresses(registry(parsedInput));
-allAddresses = [...new Set(allAddresses)];
-const encodedAddresses = ethers.utils.defaultAbiCoder.encode(['address[]'], [allAddresses]);
-console.log(encodedAddresses);
\ No newline at end of file
diff --git a/utils/layerZeroChainIds.js b/utils/layerZeroChainIds.js
deleted file mode 100755
index 24f72ef..0000000
--- a/utils/layerZeroChainIds.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const { layerZeroChainIds } = require('@angleprotocol/sdk');
-
-// Ensure an argument has been provided
-if (process.argv.length < 3) {
-  console.error('Please provide a chain input as an argument.');
-  process.exit(1);
-}
-
-// Get the argument from the command line input
-// process.argv[0] is the node command
-// process.argv[1] is the path to the runner.js file
-// process.argv[2] is the first argument provided by the user
-const chainInput = process.argv[2];
-
-// Try to parse the input as a number if possible
-const parsedInput = isNaN(Number(chainInput)) ? chainInput : Number(chainInput);
-
-// Call the function with the input
-const result = layerZeroChainIds[parsedInput];
-if(!result) process.exit(1);
-console.log(result);
diff --git a/utils/layerZeroEndpoint.js b/utils/layerZeroEndpoint.js
deleted file mode 100755
index a5deaa7..0000000
--- a/utils/layerZeroEndpoint.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const { LZ_ADDRESS, ChainKey, ChainId } = require('@layerzerolabs/lz-sdk');
-const { layerZeroChainIds } = require('@angleprotocol/sdk');
-
-// Ensure an argument has been provided
-if (process.argv.length < 3) {
-  console.error('Please provide a chain input as an argument.');
-  process.exit(1);
-}
-
-// Get the argument from the command line input
-// process.argv[0] is the node command
-// process.argv[1] is the path to the runner.js file
-// process.argv[2] is the first argument provided by the user
-const chainInput = process.argv[2];
-
-// Try to parse the input as a number if possible
-const parsedInput = isNaN(Number(chainInput)) ? chainInput : Number(chainInput);
-
-// Call the function with the input
-const result = LZ_ADDRESS[ChainKey[ChainId[layerZeroChainIds[parsedInput]]]];
-if(!result) process.exit(1);
-console.log(result);