diff --git a/ethereum/gatekeeper-cli/README.md b/ethereum/gatekeeper-cli/README.md
index 00f382e7..4f509010 100644
--- a/ethereum/gatekeeper-cli/README.md
+++ b/ethereum/gatekeeper-cli/README.md
@@ -77,8 +77,8 @@ gateway-eth create-gatekeeper-network -c goerli <id> <name>
 $ npm install -g @identity.com/gateway-eth-cli
 $ gateway-eth COMMAND
 running command...
-$ gateway-eth (-v|--version|version)
-@identity.com/gateway-eth-cli/0.2.2 darwin-x64 node-v20.11.0
+$ gateway-eth (--version)
+@identity.com/gateway-eth-cli/0.2.3 darwin-arm64 node-v20.10.0
 $ gateway-eth --help [COMMAND]
 USAGE
   $ gateway-eth COMMAND
@@ -104,6 +104,7 @@ USAGE
 * [`gateway-eth rename-gatekeeper-network ID NAME`](#gateway-eth-rename-gatekeeper-network-id-name)
 * [`gateway-eth revoke ADDRESS`](#gateway-eth-revoke-address)
 * [`gateway-eth unfreeze ADDRESS`](#gateway-eth-unfreeze-address)
+* [`gateway-eth verify ADDRESS`](#gateway-eth-verify-address)
 
 ## `gateway-eth add-gatekeeper ADDRESS`
 
@@ -111,46 +112,54 @@ Add a gatekeeper to a gatekeeper network
 
 ```
 USAGE
-  $ gateway-eth add-gatekeeper ADDRESS
+  $ gateway-eth add-gatekeeper [ADDRESS] [-h] [-p <value>] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-f <value>] [-g <value>] [-w <value>]
 
 ARGUMENTS
   ADDRESS  Gatekeeper address to add to the gatekeeper network
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
-  -f, --fees=fees
+  -f, --fees=<value>
       Gas Price level to execute transaction with. For example: instant, fast, standard, slow
 
-  -g, --gasLimit=gasLimit
+  -g, --gasLimit=<value>
       Gas limit to set for the transaction. Required only for chains/providers that do not support eth_estimateGas
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -p, --privateKey=privateKey
+  -p, --privateKey=<value>
       [default: 0xf1ddf80d2b5d038bc2ab7ae9a26e017d2252218dc687ab72d45f84bfbee2957d] The ethereum address private key for
       signing messages (or set PRIVATE_KEY environment variable)
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-  -w, --confirmations=confirmations
-      [default: [object Object]] The amount of blocks to wait for mined transaction
+  -w, --confirmations=<value>
+      [default: 1] The amount of blocks to wait for mined transaction
 
-EXAMPLE
+DESCRIPTION
+  Add a gatekeeper to a gatekeeper network
+
+EXAMPLES
   $ gateway-eth add-gatekeeper 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 -n 123
 ```
 
-_See code: [dist/commands/add-gatekeeper.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/add-gatekeeper.ts)_
+_See code: [dist/commands/add-gatekeeper.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/add-gatekeeper.ts)_
 
 ## `gateway-eth add-network-authority ADDRESS`
 
@@ -158,46 +167,54 @@ Add a network authority to a GatewayToken contract
 
 ```
 USAGE
-  $ gateway-eth add-network-authority ADDRESS
+  $ gateway-eth add-network-authority [ADDRESS] [-h] [-p <value>] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-f <value>] [-g <value>] [-w <value>]
 
 ARGUMENTS
   ADDRESS  Network authority address to add to the gatekeeper network
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
-  -f, --fees=fees
+  -f, --fees=<value>
       Gas Price level to execute transaction with. For example: instant, fast, standard, slow
 
-  -g, --gasLimit=gasLimit
+  -g, --gasLimit=<value>
       Gas limit to set for the transaction. Required only for chains/providers that do not support eth_estimateGas
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -p, --privateKey=privateKey
+  -p, --privateKey=<value>
       [default: 0xf1ddf80d2b5d038bc2ab7ae9a26e017d2252218dc687ab72d45f84bfbee2957d] The ethereum address private key for
       signing messages (or set PRIVATE_KEY environment variable)
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-  -w, --confirmations=confirmations
-      [default: [object Object]] The amount of blocks to wait for mined transaction
+  -w, --confirmations=<value>
+      [default: 1] The amount of blocks to wait for mined transaction
+
+DESCRIPTION
+  Add a network authority to a GatewayToken contract
 
-EXAMPLE
+EXAMPLES
   $ gateway-eth add-network-authority 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 -n 123
 ```
 
-_See code: [dist/commands/add-network-authority.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/add-network-authority.ts)_
+_See code: [dist/commands/add-network-authority.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/add-network-authority.ts)_
 
 ## `gateway-eth burn ADDRESS`
 
@@ -205,46 +222,54 @@ Burn existing gateway token
 
 ```
 USAGE
-  $ gateway-eth burn ADDRESS
+  $ gateway-eth burn [ADDRESS] [-h] [-p <value>] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-f <value>] [-g <value>] [-w <value>]
 
 ARGUMENTS
   ADDRESS  Token owner address
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
-  -f, --fees=fees
+  -f, --fees=<value>
       Gas Price level to execute transaction with. For example: instant, fast, standard, slow
 
-  -g, --gasLimit=gasLimit
+  -g, --gasLimit=<value>
       Gas limit to set for the transaction. Required only for chains/providers that do not support eth_estimateGas
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -p, --privateKey=privateKey
+  -p, --privateKey=<value>
       [default: 0xf1ddf80d2b5d038bc2ab7ae9a26e017d2252218dc687ab72d45f84bfbee2957d] The ethereum address private key for
       signing messages (or set PRIVATE_KEY environment variable)
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-  -w, --confirmations=confirmations
-      [default: [object Object]] The amount of blocks to wait for mined transaction
+  -w, --confirmations=<value>
+      [default: 1] The amount of blocks to wait for mined transaction
+
+DESCRIPTION
+  Burn existing gateway token
 
-EXAMPLE
+EXAMPLES
   $ gateway-eth burn 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 -n 123
 ```
 
-_See code: [dist/commands/burn.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/burn.ts)_
+_See code: [dist/commands/burn.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/burn.ts)_
 
 ## `gateway-eth create-gatekeeper-network ID NAME`
 
@@ -252,44 +277,52 @@ Create a new gatekeeper network
 
 ```
 USAGE
-  $ gateway-eth create-gatekeeper-network ID NAME
+  $ gateway-eth create-gatekeeper-network [ID] [NAME] [-h] [-p <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-t <value>] [-f <value>] [-g <value>] [-w <value>]
 
 ARGUMENTS
   ID    ID of the new network
   NAME  Name of the new network
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
-  -f, --fees=fees
+  -f, --fees=<value>
       Gas Price level to execute transaction with. For example: instant, fast, standard, slow
 
-  -g, --gasLimit=gasLimit
+  -g, --gasLimit=<value>
       Gas limit to set for the transaction. Required only for chains/providers that do not support eth_estimateGas
 
   -h, --help
       Show CLI help.
 
-  -p, --privateKey=privateKey
+  -p, --privateKey=<value>
       [default: 0xf1ddf80d2b5d038bc2ab7ae9a26e017d2252218dc687ab72d45f84bfbee2957d] The ethereum address private key for
       signing messages (or set PRIVATE_KEY environment variable)
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-  -w, --confirmations=confirmations
-      [default: [object Object]] The amount of blocks to wait for mined transaction
+  -w, --confirmations=<value>
+      [default: 1] The amount of blocks to wait for mined transaction
 
-EXAMPLE
+DESCRIPTION
+  Create a new gatekeeper network
+
+EXAMPLES
   $ gateway-eth create-gatekeeper-network <number> <name>
 ```
 
-_See code: [dist/commands/create-gatekeeper-network.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/create-gatekeeper-network.ts)_
+_See code: [dist/commands/create-gatekeeper-network.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/create-gatekeeper-network.ts)_
 
 ## `gateway-eth freeze ADDRESS`
 
@@ -297,46 +330,54 @@ Freeze existing gateway token
 
 ```
 USAGE
-  $ gateway-eth freeze ADDRESS
+  $ gateway-eth freeze [ADDRESS] [-h] [-p <value>] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-f <value>] [-g <value>] [-w <value>]
 
 ARGUMENTS
   ADDRESS  Token owner address
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
-  -f, --fees=fees
+  -f, --fees=<value>
       Gas Price level to execute transaction with. For example: instant, fast, standard, slow
 
-  -g, --gasLimit=gasLimit
+  -g, --gasLimit=<value>
       Gas limit to set for the transaction. Required only for chains/providers that do not support eth_estimateGas
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -p, --privateKey=privateKey
+  -p, --privateKey=<value>
       [default: 0xf1ddf80d2b5d038bc2ab7ae9a26e017d2252218dc687ab72d45f84bfbee2957d] The ethereum address private key for
       signing messages (or set PRIVATE_KEY environment variable)
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-  -w, --confirmations=confirmations
-      [default: [object Object]] The amount of blocks to wait for mined transaction
+  -w, --confirmations=<value>
+      [default: 1] The amount of blocks to wait for mined transaction
+
+DESCRIPTION
+  Freeze existing gateway token
 
-EXAMPLE
+EXAMPLES
   $ gateway-eth freeze 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 -n 123
 ```
 
-_See code: [dist/commands/freeze.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/freeze.ts)_
+_See code: [dist/commands/freeze.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/freeze.ts)_
 
 ## `gateway-eth get-gatekeeper-network ID`
 
@@ -344,30 +385,38 @@ Check if a gatekeeper network exists
 
 ```
 USAGE
-  $ gateway-eth get-gatekeeper-network ID
+  $ gateway-eth get-gatekeeper-network [ID] [-h] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-t <value>]
 
 ARGUMENTS
   ID  ID of the network
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
   -h, --help
       Show CLI help.
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-EXAMPLE
+DESCRIPTION
+  Check if a gatekeeper network exists
+
+EXAMPLES
   $ gateway-eth get-gatekeeper-network <number>
 ```
 
-_See code: [dist/commands/get-gatekeeper-network.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/get-gatekeeper-network.ts)_
+_See code: [dist/commands/get-gatekeeper-network.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/get-gatekeeper-network.ts)_
 
 ## `gateway-eth get-token ADDRESS`
 
@@ -375,36 +424,44 @@ Get existing gateway token
 
 ```
 USAGE
-  $ gateway-eth get-token ADDRESS
+  $ gateway-eth get-token [ADDRESS] [-h] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base]
 
 ARGUMENTS
   ADDRESS  Token owner address
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
+DESCRIPTION
+  Get existing gateway token
+
 ALIASES
   $ gateway-eth verify
 
-EXAMPLE
+EXAMPLES
   $ gateway-eth get 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 -n 123
 ```
 
-_See code: [dist/commands/get-token.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/get-token.ts)_
+_See code: [dist/commands/get-token.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/get-token.ts)_
 
 ## `gateway-eth help [COMMAND]`
 
@@ -412,13 +469,16 @@ Display help for gateway-eth.
 
 ```
 USAGE
-  $ gateway-eth help [COMMAND]
+  $ gateway-eth help [COMMAND] [-n]
 
 ARGUMENTS
   COMMAND  Command to show help for.
 
-OPTIONS
+FLAGS
   -n, --nested-commands  Include all nested commands in the output.
+
+DESCRIPTION
+  Display help for gateway-eth.
 ```
 
 _See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.1.20/src/commands/help.ts)_
@@ -429,33 +489,41 @@ Check if a gatekeeper is added to a network
 
 ```
 USAGE
-  $ gateway-eth is-gatekeeper GATEKEEPERADDRESS
+  $ gateway-eth is-gatekeeper [GATEKEEPERADDRESS] [-h] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-t <value>] [-n <value>]
 
 ARGUMENTS
   GATEKEEPERADDRESS  Address of the Gatekeeper Authority
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-EXAMPLE
+DESCRIPTION
+  Check if a gatekeeper is added to a network
+
+EXAMPLES
   $ gateway-eth is-gatekeeper -n <slot id> <gatekeeper address>
 ```
 
-_See code: [dist/commands/is-gatekeeper.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/is-gatekeeper.ts)_
+_See code: [dist/commands/is-gatekeeper.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/is-gatekeeper.ts)_
 
 ## `gateway-eth issue ADDRESS [EXPIRY]`
 
@@ -463,59 +531,67 @@ Issue a new gateway token for a given owner address and gatekeeper network
 
 ```
 USAGE
-  $ gateway-eth issue ADDRESS [EXPIRY]
+  $ gateway-eth issue [ADDRESS] [EXPIRY] [-h] [-p <value>] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-f <value>] [-w <value>] [-g <value>] [-b <value>] [-u <value>] [-x <value>] [-a <value>]
 
 ARGUMENTS
   ADDRESS  Token owner address
   EXPIRY   [default: [object Object]] Expiry timestamp for the issued token
 
-OPTIONS
-  -a, --charge=charge
+FLAGS
+  -a, --charge=<value>
       Charge in native tokens for the transaction
 
-  -b, --bitmask=bitmask
+  -b, --bitmask=<value>
       [default: [object Object]] Bitmask constraints to link with newly minting token
 
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
-  -f, --fees=fees
+  -f, --fees=<value>
       Gas Price level to execute transaction with. For example: instant, fast, standard, slow
 
-  -g, --gasLimit=gasLimit
+  -g, --gasLimit=<value>
       Gas limit to set for the transaction. Required only for chains/providers that do not support eth_estimateGas
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -p, --privateKey=privateKey
+  -p, --privateKey=<value>
       [default: 0xf1ddf80d2b5d038bc2ab7ae9a26e017d2252218dc687ab72d45f84bfbee2957d] The ethereum address private key for
       signing messages (or set PRIVATE_KEY environment variable)
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-  -u, --uri=uri
+  -u, --uri=<value>
       TokenURI to link with the issued token
 
-  -w, --confirmations=confirmations
-      [default: [object Object]] The amount of blocks to wait for mined transaction
+  -w, --confirmations=<value>
+      [default: 1] The amount of blocks to wait for mined transaction
 
-  -x, --forwarder=forwarder
+  -x, --forwarder=<value>
       Forward the transaction to the forwarder contract
 
-EXAMPLE
+DESCRIPTION
+  Issue a new gateway token for a given owner address and gatekeeper network
+
+EXAMPLES
   $ gateway-eth issue 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 -n 123
 ```
 
-_See code: [dist/commands/issue.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/issue.ts)_
+_See code: [dist/commands/issue.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/issue.ts)_
 
 ## `gateway-eth listen ADDRESS`
 
@@ -523,33 +599,41 @@ Listen to changes on a gateway token
 
 ```
 USAGE
-  $ gateway-eth listen ADDRESS
+  $ gateway-eth listen [ADDRESS] [-h] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base]
 
 ARGUMENTS
   ADDRESS  Token owner address
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-EXAMPLE
+DESCRIPTION
+  Listen to changes on a gateway token
+
+EXAMPLES
   $ gateway-eth listen 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 -n 123
 ```
 
-_See code: [dist/commands/listen.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/listen.ts)_
+_See code: [dist/commands/listen.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/listen.ts)_
 
 ## `gateway-eth refresh ADDRESS [EXPIRY]`
 
@@ -557,47 +641,55 @@ Refresh existing gateway token for Ethereum address
 
 ```
 USAGE
-  $ gateway-eth refresh ADDRESS [EXPIRY]
+  $ gateway-eth refresh [ADDRESS] [EXPIRY] [-h] [-p <value>] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-f <value>] [-g <value>] [-w <value>]
 
 ARGUMENTS
   ADDRESS  Token owner address
   EXPIRY   [default: [object Object]] Expiry timestamp for newly issued token
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
-  -f, --fees=fees
+  -f, --fees=<value>
       Gas Price level to execute transaction with. For example: instant, fast, standard, slow
 
-  -g, --gasLimit=gasLimit
+  -g, --gasLimit=<value>
       Gas limit to set for the transaction. Required only for chains/providers that do not support eth_estimateGas
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -p, --privateKey=privateKey
+  -p, --privateKey=<value>
       [default: 0xf1ddf80d2b5d038bc2ab7ae9a26e017d2252218dc687ab72d45f84bfbee2957d] The ethereum address private key for
       signing messages (or set PRIVATE_KEY environment variable)
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-  -w, --confirmations=confirmations
-      [default: [object Object]] The amount of blocks to wait for mined transaction
+  -w, --confirmations=<value>
+      [default: 1] The amount of blocks to wait for mined transaction
 
-EXAMPLE
+DESCRIPTION
+  Refresh existing gateway token for Ethereum address
+
+EXAMPLES
   $ gateway-eth refresh 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 60 -n 123
 ```
 
-_See code: [dist/commands/refresh.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/refresh.ts)_
+_See code: [dist/commands/refresh.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/refresh.ts)_
 
 ## `gateway-eth remove-gatekeeper ADDRESS`
 
@@ -605,46 +697,54 @@ Remove a gatekeeper from a gatekeeper network
 
 ```
 USAGE
-  $ gateway-eth remove-gatekeeper ADDRESS
+  $ gateway-eth remove-gatekeeper [ADDRESS] [-h] [-p <value>] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-f <value>] [-g <value>] [-w <value>]
 
 ARGUMENTS
   ADDRESS  Gatekeeper address to remove from the gatekeeper network
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
-  -f, --fees=fees
+  -f, --fees=<value>
       Gas Price level to execute transaction with. For example: instant, fast, standard, slow
 
-  -g, --gasLimit=gasLimit
+  -g, --gasLimit=<value>
       Gas limit to set for the transaction. Required only for chains/providers that do not support eth_estimateGas
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -p, --privateKey=privateKey
+  -p, --privateKey=<value>
       [default: 0xf1ddf80d2b5d038bc2ab7ae9a26e017d2252218dc687ab72d45f84bfbee2957d] The ethereum address private key for
       signing messages (or set PRIVATE_KEY environment variable)
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-  -w, --confirmations=confirmations
-      [default: [object Object]] The amount of blocks to wait for mined transaction
+  -w, --confirmations=<value>
+      [default: 1] The amount of blocks to wait for mined transaction
+
+DESCRIPTION
+  Remove a gatekeeper from a gatekeeper network
 
-EXAMPLE
+EXAMPLES
   $ gateway-eth remove-gatekeeper 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 -n 123
 ```
 
-_See code: [dist/commands/remove-gatekeeper.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/remove-gatekeeper.ts)_
+_See code: [dist/commands/remove-gatekeeper.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/remove-gatekeeper.ts)_
 
 ## `gateway-eth remove-network-authority ADDRESS`
 
@@ -652,46 +752,54 @@ Remove a network authority from a gatekeeper network
 
 ```
 USAGE
-  $ gateway-eth remove-network-authority ADDRESS
+  $ gateway-eth remove-network-authority [ADDRESS] [-h] [-p <value>] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-f <value>] [-g <value>] [-w <value>]
 
 ARGUMENTS
   ADDRESS  Network authority address to add to the gatekeeper network
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
-  -f, --fees=fees
+  -f, --fees=<value>
       Gas Price level to execute transaction with. For example: instant, fast, standard, slow
 
-  -g, --gasLimit=gasLimit
+  -g, --gasLimit=<value>
       Gas limit to set for the transaction. Required only for chains/providers that do not support eth_estimateGas
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -p, --privateKey=privateKey
+  -p, --privateKey=<value>
       [default: 0xf1ddf80d2b5d038bc2ab7ae9a26e017d2252218dc687ab72d45f84bfbee2957d] The ethereum address private key for
       signing messages (or set PRIVATE_KEY environment variable)
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-  -w, --confirmations=confirmations
-      [default: [object Object]] The amount of blocks to wait for mined transaction
+  -w, --confirmations=<value>
+      [default: 1] The amount of blocks to wait for mined transaction
+
+DESCRIPTION
+  Remove a network authority from a gatekeeper network
 
-EXAMPLE
+EXAMPLES
   $ gateway-eth remove-network-authority 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 -n 123
 ```
 
-_See code: [dist/commands/remove-network-authority.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/remove-network-authority.ts)_
+_See code: [dist/commands/remove-network-authority.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/remove-network-authority.ts)_
 
 ## `gateway-eth rename-gatekeeper-network ID NAME`
 
@@ -699,44 +807,52 @@ Rename a gatekeeper network
 
 ```
 USAGE
-  $ gateway-eth rename-gatekeeper-network ID NAME
+  $ gateway-eth rename-gatekeeper-network [ID] [NAME] [-h] [-p <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-t <value>] [-f <value>] [-g <value>] [-w <value>]
 
 ARGUMENTS
   ID    ID of the new network
   NAME  New name of the new network
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
-  -f, --fees=fees
+  -f, --fees=<value>
       Gas Price level to execute transaction with. For example: instant, fast, standard, slow
 
-  -g, --gasLimit=gasLimit
+  -g, --gasLimit=<value>
       Gas limit to set for the transaction. Required only for chains/providers that do not support eth_estimateGas
 
   -h, --help
       Show CLI help.
 
-  -p, --privateKey=privateKey
+  -p, --privateKey=<value>
       [default: 0xf1ddf80d2b5d038bc2ab7ae9a26e017d2252218dc687ab72d45f84bfbee2957d] The ethereum address private key for
       signing messages (or set PRIVATE_KEY environment variable)
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-  -w, --confirmations=confirmations
-      [default: [object Object]] The amount of blocks to wait for mined transaction
+  -w, --confirmations=<value>
+      [default: 1] The amount of blocks to wait for mined transaction
 
-EXAMPLE
+DESCRIPTION
+  Rename a gatekeeper network
+
+EXAMPLES
   $ gateway-eth rename-gatekeeper-network <name> <number>
 ```
 
-_See code: [dist/commands/rename-gatekeeper-network.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/rename-gatekeeper-network.ts)_
+_See code: [dist/commands/rename-gatekeeper-network.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/rename-gatekeeper-network.ts)_
 
 ## `gateway-eth revoke ADDRESS`
 
@@ -744,46 +860,54 @@ Revoke existing gateway token
 
 ```
 USAGE
-  $ gateway-eth revoke ADDRESS
+  $ gateway-eth revoke [ADDRESS] [-h] [-p <value>] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-f <value>] [-g <value>] [-w <value>]
 
 ARGUMENTS
   ADDRESS  Token owner address
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
-  -f, --fees=fees
+  -f, --fees=<value>
       Gas Price level to execute transaction with. For example: instant, fast, standard, slow
 
-  -g, --gasLimit=gasLimit
+  -g, --gasLimit=<value>
       Gas limit to set for the transaction. Required only for chains/providers that do not support eth_estimateGas
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -p, --privateKey=privateKey
+  -p, --privateKey=<value>
       [default: 0xf1ddf80d2b5d038bc2ab7ae9a26e017d2252218dc687ab72d45f84bfbee2957d] The ethereum address private key for
       signing messages (or set PRIVATE_KEY environment variable)
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-  -w, --confirmations=confirmations
-      [default: [object Object]] The amount of blocks to wait for mined transaction
+  -w, --confirmations=<value>
+      [default: 1] The amount of blocks to wait for mined transaction
+
+DESCRIPTION
+  Revoke existing gateway token
 
-EXAMPLE
+EXAMPLES
   $ gateway-eth revoke 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 -n 123
 ```
 
-_See code: [dist/commands/revoke.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/revoke.ts)_
+_See code: [dist/commands/revoke.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/revoke.ts)_
 
 ## `gateway-eth unfreeze ADDRESS`
 
@@ -791,44 +915,95 @@ Unfreezing existing gateway token
 
 ```
 USAGE
-  $ gateway-eth unfreeze ADDRESS
+  $ gateway-eth unfreeze [ADDRESS] [-h] [-p <value>] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base] [-f <value>] [-g <value>] [-w <value>]
 
 ARGUMENTS
   ADDRESS  Token owner address
 
-OPTIONS
-  -c, --chain=localhost|ethereum|sepolia|goerli|polygonMumbai|polygon|auroraTestnet|aurora|optimismGoerli|optimism|palmT
-  estnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starknet|st
-  arknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygonZkEVM
-  |baseSepolia|base
+FLAGS
+  -c, --chain=<option>
       [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
 
-  -f, --fees=fees
+  -f, --fees=<value>
       Gas Price level to execute transaction with. For example: instant, fast, standard, slow
 
-  -g, --gasLimit=gasLimit
+  -g, --gasLimit=<value>
       Gas limit to set for the transaction. Required only for chains/providers that do not support eth_estimateGas
 
   -h, --help
       Show CLI help.
 
-  -n, --gatekeeperNetwork=gatekeeperNetwork
+  -n, --gatekeeperNetwork=<value>
       [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
 
-  -p, --privateKey=privateKey
+  -p, --privateKey=<value>
       [default: 0xf1ddf80d2b5d038bc2ab7ae9a26e017d2252218dc687ab72d45f84bfbee2957d] The ethereum address private key for
       signing messages (or set PRIVATE_KEY environment variable)
 
-  -t, --gatewayTokenAddress=gatewayTokenAddress
+  -t, --gatewayTokenAddress=<value>
       [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
       environment variable)
 
-  -w, --confirmations=confirmations
-      [default: [object Object]] The amount of blocks to wait for mined transaction
+  -w, --confirmations=<value>
+      [default: 1] The amount of blocks to wait for mined transaction
+
+DESCRIPTION
+  Unfreezing existing gateway token
 
-EXAMPLE
+EXAMPLES
   $ gateway-eth unfreeze 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 -n 123
 ```
 
-_See code: [dist/commands/unfreeze.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.2/dist/commands/unfreeze.ts)_
+_See code: [dist/commands/unfreeze.ts](https://github.com/identity-com/on-chain-identity-gateway/blob/v0.2.3/dist/commands/unfreeze.ts)_
+
+## `gateway-eth verify ADDRESS`
+
+Get existing gateway token
+
+```
+USAGE
+  $ gateway-eth verify [ADDRESS] [-h] [-t <value>] [-n <value>] [-c
+    localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|optimism|pal
+    mTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFuji|starkne
+    t|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTestnet|polygo
+    nZkEVM|baseSepolia|base]
+
+ARGUMENTS
+  ADDRESS  Token owner address
+
+FLAGS
+  -c, --chain=<option>
+      [default: [object Object]] Specify target chain to work with (or set DEFAULT_CHAIN environment variable)
+      <options: localhost|ethereum|sepolia|goerli|polygonMumbai|polygonAmoy|polygon|auroraTestnet|aurora|optimismGoerli|op
+      timism|palmTestnet|palm|arbitrumGoerli|arbitrumSepolia|arbitrum|celo|celoAlfajores|avalancheCChain|avalancheCChainFu
+      ji|starknet|starknetGoerli|xdc|xdcApothem|bsc|cronos|fantom|fantomTestnet|gnosis|moonbeam|moonriver|polygonZkEVMTest
+      net|polygonZkEVM|baseSepolia|base>
+
+  -h, --help
+      Show CLI help.
+
+  -n, --gatekeeperNetwork=<value>
+      [default: 1] Gatekeeper network. Defaults to the test Gatekeeper Network
+
+  -t, --gatewayTokenAddress=<value>
+      [default: 0xF65b6396dF6B7e2D8a6270E3AB6c7BB08BAEF22E] GatewayToken address to target (or set GATEWAY_TOKEN_ADDRESS
+      environment variable)
+
+DESCRIPTION
+  Get existing gateway token
+
+ALIASES
+  $ gateway-eth verify
+
+EXAMPLES
+  $ gateway-eth get 0x893F4Be53274353CD3379C87C8fd1cb4f8458F94 -n 123
+```
 <!-- commandsstop -->
diff --git a/ethereum/gatekeeper-cli/package.json b/ethereum/gatekeeper-cli/package.json
index 8d2e4b4a..b83e53f0 100644
--- a/ethereum/gatekeeper-cli/package.json
+++ b/ethereum/gatekeeper-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@identity.com/gateway-eth-cli",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Identity.com Gateway Protocol EVM CLI",
   "author": "dankelleher @dankelleher",
   "bin": {
@@ -25,7 +25,7 @@
     "@ethersproject/units": "^5.7.0",
     "@ethersproject/wallet": "^5.7.0",
     "@ethersproject/web": "^5.7.1",
-    "@identity.com/gateway-eth-ts": "0.8.1",
+    "@identity.com/gateway-eth-ts": "^0.8.1",
     "@oclif/core": "^1.23.2",
     "@oclif/dev-cli": "^1.26.10",
     "@oclif/plugin-help": "^5",
diff --git a/ethereum/gatekeeper-cli/src/utils/oclif/providers.ts b/ethereum/gatekeeper-cli/src/utils/oclif/providers.ts
index fc68f9cf..90183b1f 100644
--- a/ethereum/gatekeeper-cli/src/utils/oclif/providers.ts
+++ b/ethereum/gatekeeper-cli/src/utils/oclif/providers.ts
@@ -29,6 +29,10 @@ export const networks = {
     url: 'https://polygon-mumbai.infura.io/v3/',
     chainId: 80_001,
   },
+  polygonAmoy: {
+    url: 'https://polygon-amoy.infura.io/v3/',
+    chainId: 80_002,
+  },
   polygon: {
     url: 'https://polygon-mainnet.infura.io/v3/',
     chainId: 137,
@@ -172,7 +176,7 @@ export const getProvider = function (
 ): BaseProvider {
   if (network === 'localhost') return getLocalhostProvider()
 
-  const url = networks[network].url
+  const url = process.env.RPC ?? networks[network].url
   if (url.includes('infura')) {
     return new ExtendedInfuraProvider(network, process.env.INFURA_API_KEY)
   }
diff --git a/ethereum/gatekeeper-cli/yarn.lock b/ethereum/gatekeeper-cli/yarn.lock
index 47a2f686..38f6b8a0 100644
--- a/ethereum/gatekeeper-cli/yarn.lock
+++ b/ethereum/gatekeeper-cli/yarn.lock
@@ -600,7 +600,7 @@
   resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@identity.com/gateway-eth-ts@0.8.1":
+"@identity.com/gateway-eth-ts@^0.8.1":
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/@identity.com/gateway-eth-ts/-/gateway-eth-ts-0.8.1.tgz#3c243f0e481130ee151b757ac089698187923f54"
   integrity sha512-To50CHpvaOmvrq9eXYhHMASfX8JF5yBgIqnbnCLAp2Un3UGSQ0SUF0sdcj0/rjnP67mSAKFrCDE9w7PhW+wu1g==