diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3f7233e..028617a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Run Forge tests
         run: |
-          forge test --fork-url https://rpc.ankr.com/eth_goerli -vvvv --fork-block-number 8897000
+          forge test --fork-url https://rpc.ankr.com/eth_goerli -vvvv --fork-block-number 8897777
         id: test
         
       - name: Initialise status badge
diff --git a/src/CCIP2ETH.sol b/src/CCIP2ETH.sol
index 7827643..bac6861 100644
--- a/src/CCIP2ETH.sol
+++ b/src/CCIP2ETH.sol
@@ -296,7 +296,7 @@ contract CCIP2ETH is iCCIP2ETH {
             string memory _domain, // String-formatted complete 'a.b.c.domain.eth'
             string memory _recType, // Record type
             , // Complete reverse-DNS path for __fallback()
-            , // DNS-encoded domain.eth
+            , // DNS-encoded full domain.eth
             bytes memory _request // Format: <bytes4> + <namehash> + <extradata>
         ) = abi.decode(extradata, (bytes32, uint256, bytes32, string, string, string, bytes, bytes));
         address _owner = ENS.owner(_node);
@@ -569,12 +569,12 @@ contract CCIP2ETH is iCCIP2ETH {
     function updateChainID() public {
         chainID = gateway.uintToString(block.chainid);
     }
+
     /**
      * @dev Sets fees for ownerhash
      * Note - Set to 0 at launch
      * @param _wei - Fees in WEI per EOA
      */
-
     function updateOwnerhashFees(uint256 _wei) external OnlyDev {
         ownerhashFees = _wei;
     }
diff --git a/src/Interface.sol b/src/Interface.sol
index 0086d8e..281482e 100644
--- a/src/Interface.sol
+++ b/src/Interface.sol
@@ -74,6 +74,16 @@ interface iGatewayManager is iERC173 {
     function replaceWeb3Gateway(uint256 _index, string calldata _domain) external;
     function formatSubdomain(bytes calldata _recordhash) external pure returns (string memory result);
     function isWeb2(bytes calldata _recordhash) external pure returns (bool);
+
+    function listWeb2Gateways() external view returns (string[] memory list);
+    function addWeb2Gateway(string calldata _domain) external;
+    function removeWeb2Gateway(uint256 _index) external;
+    function replaceWeb2Gateway(uint256 _index, string calldata _domain) external;
+
+    function listWeb3Gateways() external view returns (string[] memory list);
+    function addWeb3Gateway(string calldata _domain) external;
+    function removeWeb3Gateway(uint256 _index) external;
+    function replaceWeb3Gateway(uint256 _index, string calldata _domain) external;
 }
 
 interface iResolver {
diff --git a/test/goerli.sh b/test/goerli.sh
index fc6bfe2..5865e33 100755
--- a/test/goerli.sh
+++ b/test/goerli.sh
@@ -1 +1 @@
-forge fmt && source .env && forge test --fork-url $GOERLI_RPC_URL -vvv --fork-block-number 8897777 --gas-report --watch
+forge fmt && source .env && forge test --fork-url $GOERLI_RPC_URL -vvv --fork-block-number 8897777 -vvvv --gas-report --watch