diff --git a/mustache/templates/echoer/contracts.js b/mustache/templates/echoer/contracts.js
index 59e6efb..d91fe49 100644
--- a/mustache/templates/echoer/contracts.js
+++ b/mustache/templates/echoer/contracts.js
@@ -17,6 +17,12 @@ const contracts = [
     name: 'Echoer',
     address: '0x756C4628E57F7e7f8a459EC2752968360Cf4D1AA',
   },
+  {
+    prod: 3781595,
+    network: 'goerli',
+    name: 'Echoer',
+    address: '0x37e6859804b6499d1e4a86d70a5fdd5de6a0ac65',
+  },
 ];
 
 module.exports = contracts;
diff --git a/mustache/templates/instance/contracts.js b/mustache/templates/instance/contracts.js
index 6843ba9..9ea39fa 100644
--- a/mustache/templates/instance/contracts.js
+++ b/mustache/templates/instance/contracts.js
@@ -1,6 +1,13 @@
+const deployedBlocks = {
+  goerli: 3781595,
+  mainnet: 9116966,
+  matic: 15586940,
+  bsc: 8159290,
+};
+
 const contracts = [
   {
-    prod: 8159279,
+    prod: deployedBlocks.bsc,
     amount: '0.1',
     network: 'bsc',
     currency: 'bnb',
@@ -8,7 +15,7 @@ const contracts = [
     address: '0x84443CFd09A48AF6eF360C6976C5392aC5023a1F',
   },
   {
-    prod: 8159286,
+    prod: deployedBlocks.bsc,
     amount: '1',
     network: 'bsc',
     currency: 'bnb',
@@ -16,7 +23,7 @@ const contracts = [
     address: '0xd47438C816c9E7f2E2888E060936a499Af9582b3',
   },
   {
-    prod: 8159290,
+    prod: deployedBlocks.bsc,
     amount: '10',
     network: 'bsc',
     currency: 'bnb',
@@ -24,7 +31,7 @@ const contracts = [
     address: '0x330bdFADE01eE9bF63C209Ee33102DD334618e0a',
   },
   {
-    prod: 8159296,
+    prod: deployedBlocks.bsc,
     amount: '100',
     network: 'bsc',
     currency: 'bnb',
@@ -32,7 +39,7 @@ const contracts = [
     address: '0x1E34A77868E19A6647b1f2F47B51ed72dEDE95DD',
   },
   {
-    prod: 15586940,
+    prod: deployedBlocks.matic,
     amount: '0.1',
     network: 'matic',
     currency: 'matic',
@@ -40,7 +47,7 @@ const contracts = [
     address: '0x992A81FA34aa6ecD9520F39f858abc51fee6994a',
   },
   {
-    prod: 9116966,
+    prod: deployedBlocks.mainnet,
     amount: '0.1',
     network: 'mainnet',
     currency: 'eth',
@@ -48,7 +55,7 @@ const contracts = [
     address: '0x12D66f87A04A9E220743712cE6d9bB1B5616B8Fc',
   },
   {
-    prod: 9116966,
+    prod: deployedBlocks.mainnet,
     amount: '1',
     network: 'mainnet',
     currency: 'eth',
@@ -56,7 +63,7 @@ const contracts = [
     address: '0x47CE0C6eD5B0Ce3d3A51fdb1C52DC66a7c3c2936',
   },
   {
-    prod: 9116966,
+    prod: deployedBlocks.mainnet,
     amount: '10',
     network: 'mainnet',
     currency: 'eth',
@@ -64,13 +71,286 @@ const contracts = [
     address: '0x910Cbd523D972eb0a6f4cAe4618aD62622b39DbF',
   },
   {
-    prod: 9116966,
+    prod: deployedBlocks.mainnet,
     amount: '100',
     network: 'mainnet',
     currency: 'eth',
     name: 'Instance',
     address: '0xA160cdAB225685dA1d56aa342Ad8841c3b53f291',
   },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '100',
+    network: 'goerli',
+    currency: 'dai',
+    name: 'Instance',
+    address: '0x76D85B4C0Fc497EeCc38902397aC608000A06607',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '100',
+    network: 'mainnet',
+    currency: 'dai',
+    name: 'Instance',
+    address: '0xD4B88Df4D29F5CedD6857912842cff3b20C8Cfa3',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '1000',
+    network: 'mainnet',
+    currency: 'dai',
+    name: 'Instance',
+    address: '0xFD8610d20aA15b7B2E3Be39B396a1bC3516c7144',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '10000',
+    network: 'mainnet',
+    currency: 'dai',
+    name: 'Instance',
+    address: '0x07687e702b410Fa43f4cB4Af7FA097918ffD2730',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '100000',
+    network: 'mainnet',
+    currency: 'dai',
+    name: 'Instance',
+    address: '0x23773E65ed146A459791799d01336DB287f25334',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '5000',
+    network: 'mainnet',
+    currency: 'cdai',
+    name: 'Instance',
+    address: '0x22aaA7720ddd5388A3c0A3333430953C68f1849b',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '50000',
+    network: 'mainnet',
+    currency: 'cdai',
+    name: 'Instance',
+    address: '0x03893a7c7463AE47D46bc7f091665f1893656003',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '500000',
+    network: 'mainnet',
+    currency: 'cdai',
+    name: 'Instance',
+    address: '0x2717c5e28cf931547B621a5dddb772Ab6A35B701',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '5000000',
+    network: 'mainnet',
+    currency: 'cdai',
+    name: 'Instance',
+    address: '0xD21be7248e0197Ee08E0c20D4a96DEBdaC3D20Af',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '100',
+    network: 'mainnet',
+    currency: 'usdc',
+    name: 'Instance',
+    address: '0xd96f2B1c14Db8458374d9Aca76E26c3D18364307',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '1000',
+    network: 'mainnet',
+    currency: 'usdc',
+    name: 'Instance',
+    address: '0x4736dCf1b7A3d580672CcE6E7c65cd5cc9cFBa9D',
+  },
+
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '100',
+    network: 'mainnet',
+    currency: 'usdt',
+    name: 'Instance',
+    address: '0x169AD27A470D064DEDE56a2D3ff727986b15D52B',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '1000',
+    network: 'mainnet',
+    currency: 'usdt',
+    name: 'Instance',
+    address: '0x0836222F2B2B24A3F36f98668Ed8F0B38D1a872f',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '0.1',
+    network: 'mainnet',
+    currency: 'wbtc',
+    name: 'Instance',
+    address: '0x178169B423a011fff22B9e3F3abeA13414dDD0F1',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '1',
+    network: 'mainnet',
+    currency: 'wbtc',
+    name: 'Instance',
+    address: '0x610B717796ad172B316836AC95a2ffad065CeaB4',
+  },
+  {
+    prod: deployedBlocks.mainnet,
+    amount: '10',
+    network: 'mainnet',
+    currency: 'wbtc',
+    name: 'Instance',
+    address: '0xbB93e510BbCD0B7beb5A853875f9eC60275CF498',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '1000',
+    network: 'goerli',
+    currency: 'dai',
+    name: 'Instance',
+    address: '0xCC84179FFD19A1627E79F8648d09e095252Bc418',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '10000',
+    network: 'goerli',
+    currency: 'dai',
+    name: 'Instance',
+    address: '0xD5d6f8D9e784d0e26222ad3834500801a68D027D',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '100000',
+    network: 'goerli',
+    currency: 'dai',
+    name: 'Instance',
+    address: '0x407CcEeaA7c95d2FE2250Bf9F2c105aA7AAFB512',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '5000',
+    network: 'goerli',
+    currency: 'cdai',
+    name: 'Instance',
+    address: '0x833481186f16Cece3f1Eeea1a694c42034c3a0dB',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '50000',
+    network: 'goerli',
+    currency: 'cdai',
+    name: 'Instance',
+    address: '0xd8D7DE3349ccaA0Fde6298fe6D7b7d0d34586193',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '500000',
+    network: 'goerli',
+    currency: 'cdai',
+    name: 'Instance',
+    address: '0x8281Aa6795aDE17C8973e1aedcA380258Bc124F9',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '5000000',
+    network: 'goerli',
+    currency: 'cdai',
+    name: 'Instance',
+    address: '0x57b2B8c82F065de8Ef5573f9730fC1449B403C9f',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '100',
+    network: 'goerli',
+    currency: 'usdc',
+    name: 'Instance',
+    address: '0x05E0b5B40B7b66098C2161A5EE11C5740A3A7C45',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '1000',
+    network: 'goerli',
+    currency: 'usdc',
+    name: 'Instance',
+    address: '0x23173fE8b96A4Ad8d2E17fB83EA5dcccdCa1Ae52',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '100',
+    network: 'goerli',
+    currency: 'usdt',
+    name: 'Instance',
+    address: '0x538Ab61E8A9fc1b2f93b3dd9011d662d89bE6FE6',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '1000',
+    network: 'goerli',
+    currency: 'usdt',
+    name: 'Instance',
+    address: '0x94Be88213a387E992Dd87DE56950a9aef34b9448',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '0.1',
+    network: 'goerli',
+    currency: 'wbtc',
+    name: 'Instance',
+    address: '0x242654336ca2205714071898f67E254EB49ACdCe',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '1',
+    network: 'goerli',
+    currency: 'wbtc',
+    name: 'Instance',
+    address: '0x776198CCF446DFa168347089d7338879273172cF',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '10',
+    network: 'goerli',
+    currency: 'wbtc',
+    name: 'Instance',
+    address: '0xeDC5d01286f99A066559F60a585406f3878a033e',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '0.1',
+    network: 'goerli',
+    currency: 'eth',
+    name: 'Instance',
+    address: '0x6Bf694a291DF3FeC1f7e69701E3ab6c592435Ae7',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '1',
+    network: 'goerli',
+    currency: 'eth',
+    name: 'Instance',
+    address: '0x3aac1cC67c2ec5Db4eA850957b967Ba153aD6279',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '10',
+    network: 'goerli',
+    currency: 'eth',
+    name: 'Instance',
+    address: '0x723B78e67497E85279CB204544566F4dC5d2acA0',
+  },
+  {
+    prod: deployedBlocks.goerli,
+    amount: '100',
+    network: 'goerli',
+    currency: 'eth',
+    name: 'Instance',
+    address: '0x0E3A09dDA6B20aFbB34aC7cD4A6881493f3E7bf7',
+  },
 ];
 
 module.exports = contracts;
diff --git a/mustache/templates/proxy/contracts.js b/mustache/templates/proxy/contracts.js
index 57f24ab..7cbac13 100644
--- a/mustache/templates/proxy/contracts.js
+++ b/mustache/templates/proxy/contracts.js
@@ -17,6 +17,12 @@ const contracts = [
     network: 'mainnet',
     address: '0x722122dF12D4e14e13Ac3b6895a86e84145b6967',
   },
+  {
+    prod: 3781595,
+    name: 'Proxy',
+    network: 'goerli',
+    address: '0x454d870a72e29d5e5697f635128d18077bd04c60',
+  },
 ];
 
 module.exports = contracts;
diff --git a/package.json b/package.json
index cd92a48..cb605e7 100644
--- a/package.json
+++ b/package.json
@@ -6,21 +6,26 @@
     "generate-bsc": "yarn codegen:tornado-bsc && yarn build:tornado-bsc",
     "generate-matic": "yarn codegen:tornado-matic && yarn build:tornado-matic",
     "generate-mainnet": "yarn codegen:tornado-mainnet && yarn build:tornado-mainnet",
+    "generate-goerli": "yarn codegen:tornado-goerli && yarn build:tornado-goerli",
     "yaml:tornado-bsc": "node ./create-yaml-file create-yaml -e bsc | mustache - mustache/yaml.mustache > subgraphs/tornado-subgraph-bsc.yaml",
     "yaml:tornado-matic": "node ./create-yaml-file create-yaml -e matic | mustache - mustache/yaml.mustache > subgraphs/tornado-subgraph-matic.yaml",
     "yaml:tornado-mainnet": "node ./create-yaml-file create-yaml -e mainnet | mustache - mustache/yaml.mustache > subgraphs/tornado-subgraph-mainnet.yaml",
+    "yaml:tornado-goerli": "node ./create-yaml-file create-yaml -e goerli | mustache - mustache/yaml.mustache > subgraphs/tornado-subgraph-goerli.yaml",
     "codegen": "graph codegen",
     "codegen:tornado-bsc": "yarn yaml:tornado-bsc && yarn codegen -- subgraphs/tornado-subgraph-bsc.yaml",
     "codegen:tornado-matic": "yarn yaml:tornado-matic && yarn codegen -- subgraphs/tornado-subgraph-matic.yaml",
     "codegen:tornado-mainnet": "yarn yaml:tornado-mainnet && yarn codegen -- subgraphs/tornado-subgraph-mainnet.yaml",
+    "codegen:tornado-goerli": "yarn yaml:tornado-goerli && yarn codegen -- subgraphs/tornado-subgraph-goerli.yaml",
     "build": "graph build",
     "build:tornado-bsc": "graph build subgraphs/tornado-subgraph-bsc.yaml",
     "build:tornado-matic": "graph build subgraphs/tornado-subgraph-matic.yaml",
     "build:tornado-mainnet": "graph build subgraphs/tornado-subgraph-mainnet.yaml",
-    "deploy": "graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ --access-token 667f58696f044059a476ed2c4ae632f3",
+    "build:tornado-goerli": "graph build subgraphs/tornado-subgraph-goerli.yaml",
+    "deploy": "graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ --access-token $TOKEN",
     "deploy:tornado-bsc": "yarn deploy -- tornadocash/bsc-tornado-subgraph subgraphs/tornado-subgraph-bsc.yaml",
     "deploy:tornado-matic": "yarn deploy -- tornadocash/matic-tornado-subgraph subgraphs/tornado-subgraph-matic.yaml",
-    "deploy:tornado-mainnet": "yarn deploy -- 0xzick/bsc-sub-graph subgraphs/tornado-subgraph-mainnet.yaml"
+    "deploy:tornado-mainnet": "yarn deploy -- tornadocash/mainnet-tornado-subgraph subgraphs/tornado-subgraph-mainnet.yaml",
+    "deploy:tornado-goerli": "yarn deploy -- tornadocash/goerli-tornado-subgraph subgraphs/tornado-subgraph-goerli.yaml"
   },
   "dependencies": {
     "@graphprotocol/graph-cli": "0.20.0",
diff --git a/src/contractsToInstances.ts b/src/contractsToInstances.ts
index 50a6f20..9395f53 100644
--- a/src/contractsToInstances.ts
+++ b/src/contractsToInstances.ts
@@ -36,4 +36,140 @@ contractsToInstances.set(
   '0xa160cdab225685da1d56aa342ad8841c3b53f291', // Instance-eth-100
   'eth-100',
 );
+contractsToInstances.set(
+  '0x76d85b4c0fc497eecc38902397ac608000a06607', // Instance-dai-100
+  'dai-100',
+);
+contractsToInstances.set(
+  '0xd4b88df4d29f5cedd6857912842cff3b20c8cfa3', // Instance-dai-100
+  'dai-100',
+);
+contractsToInstances.set(
+  '0xfd8610d20aa15b7b2e3be39b396a1bc3516c7144', // Instance-dai-1000
+  'dai-1000',
+);
+contractsToInstances.set(
+  '0x07687e702b410fa43f4cb4af7fa097918ffd2730', // Instance-dai-10000
+  'dai-10000',
+);
+contractsToInstances.set(
+  '0x23773e65ed146a459791799d01336db287f25334', // Instance-dai-100000
+  'dai-100000',
+);
+contractsToInstances.set(
+  '0x22aaa7720ddd5388a3c0a3333430953c68f1849b', // Instance-cdai-5000
+  'cdai-5000',
+);
+contractsToInstances.set(
+  '0x03893a7c7463ae47d46bc7f091665f1893656003', // Instance-cdai-50000
+  'cdai-50000',
+);
+contractsToInstances.set(
+  '0x2717c5e28cf931547b621a5dddb772ab6a35b701', // Instance-cdai-500000
+  'cdai-500000',
+);
+contractsToInstances.set(
+  '0xd21be7248e0197ee08e0c20d4a96debdac3d20af', // Instance-cdai-5000000
+  'cdai-5000000',
+);
+contractsToInstances.set(
+  '0xd96f2b1c14db8458374d9aca76e26c3d18364307', // Instance-usdc-100
+  'usdc-100',
+);
+contractsToInstances.set(
+  '0x4736dcf1b7a3d580672cce6e7c65cd5cc9cfba9d', // Instance-usdc-1000
+  'usdc-1000',
+);
+contractsToInstances.set(
+  '0x169ad27a470d064dede56a2d3ff727986b15d52b', // Instance-usdt-100
+  'usdt-100',
+);
+contractsToInstances.set(
+  '0x0836222f2b2b24a3f36f98668ed8f0b38d1a872f', // Instance-usdt-1000
+  'usdt-1000',
+);
+contractsToInstances.set(
+  '0x178169b423a011fff22b9e3f3abea13414ddd0f1', // Instance-wbtc-0.1
+  'wbtc-0.1',
+);
+contractsToInstances.set(
+  '0x610b717796ad172b316836ac95a2ffad065ceab4', // Instance-wbtc-1
+  'wbtc-1',
+);
+contractsToInstances.set(
+  '0xbb93e510bbcd0b7beb5a853875f9ec60275cf498', // Instance-wbtc-10
+  'wbtc-10',
+);
+contractsToInstances.set(
+  '0xcc84179ffd19a1627e79f8648d09e095252bc418', // Instance-dai-1000
+  'dai-1000',
+);
+contractsToInstances.set(
+  '0xd5d6f8d9e784d0e26222ad3834500801a68d027d', // Instance-dai-10000
+  'dai-10000',
+);
+contractsToInstances.set(
+  '0x407cceeaa7c95d2fe2250bf9f2c105aa7aafb512', // Instance-dai-100000
+  'dai-100000',
+);
+contractsToInstances.set(
+  '0x833481186f16cece3f1eeea1a694c42034c3a0db', // Instance-cdai-5000
+  'cdai-5000',
+);
+contractsToInstances.set(
+  '0xd8d7de3349ccaa0fde6298fe6d7b7d0d34586193', // Instance-cdai-50000
+  'cdai-50000',
+);
+contractsToInstances.set(
+  '0x8281aa6795ade17c8973e1aedca380258bc124f9', // Instance-cdai-500000
+  'cdai-500000',
+);
+contractsToInstances.set(
+  '0x57b2b8c82f065de8ef5573f9730fc1449b403c9f', // Instance-cdai-5000000
+  'cdai-5000000',
+);
+contractsToInstances.set(
+  '0x05e0b5b40b7b66098c2161a5ee11c5740a3a7c45', // Instance-usdc-100
+  'usdc-100',
+);
+contractsToInstances.set(
+  '0x23173fe8b96a4ad8d2e17fb83ea5dcccdca1ae52', // Instance-usdc-1000
+  'usdc-1000',
+);
+contractsToInstances.set(
+  '0x538ab61e8a9fc1b2f93b3dd9011d662d89be6fe6', // Instance-usdt-100
+  'usdt-100',
+);
+contractsToInstances.set(
+  '0x94be88213a387e992dd87de56950a9aef34b9448', // Instance-usdt-1000
+  'usdt-1000',
+);
+contractsToInstances.set(
+  '0x242654336ca2205714071898f67e254eb49acdce', // Instance-wbtc-0.1
+  'wbtc-0.1',
+);
+contractsToInstances.set(
+  '0x776198ccf446dfa168347089d7338879273172cf', // Instance-wbtc-1
+  'wbtc-1',
+);
+contractsToInstances.set(
+  '0xedc5d01286f99a066559f60a585406f3878a033e', // Instance-wbtc-10
+  'wbtc-10',
+);
+contractsToInstances.set(
+  '0x6bf694a291df3fec1f7e69701e3ab6c592435ae7', // Instance-eth-0.1
+  'eth-0.1',
+);
+contractsToInstances.set(
+  '0x3aac1cc67c2ec5db4ea850957b967ba153ad6279', // Instance-eth-1
+  'eth-1',
+);
+contractsToInstances.set(
+  '0x723b78e67497e85279cb204544566f4dc5d2aca0', // Instance-eth-10
+  'eth-10',
+);
+contractsToInstances.set(
+  '0x0e3a09dda6b20afbb34ac7cd4a6881493f3e7bf7', // Instance-eth-100
+  'eth-100',
+);
 // this is a read only file generated by manual inputs to file mustache/templates/rates/contracts.js.
diff --git a/subgraphs/tornado-subgraph-goerli.yaml b/subgraphs/tornado-subgraph-goerli.yaml
new file mode 100644
index 0000000..efc935a
--- /dev/null
+++ b/subgraphs/tornado-subgraph-goerli.yaml
@@ -0,0 +1,483 @@
+  specVersion: 0.0.2
+  description: Proxy
+  repository: https://github.com/tornadocash/tornado-subgraph
+  schema:
+    file: ../schema.graphql
+  dataSources:
+  - kind: ethereum/contract
+    name: Echoer
+    network: goerli
+    source:
+      address: "0x37e6859804b6499d1e4a86d70a5fdd5de6a0ac65"
+      abi: Echoer
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-echo-account.ts
+      entities:
+        - NoteAccount
+      abis:
+        - name: Echoer
+          file: ../abis/Echoer.json
+      eventHandlers:
+        - event: Echo(indexed address,bytes)
+          handler: handleEcho
+  - kind: ethereum/contract
+    name: Instance-100-dai
+    network: goerli
+    source:
+      address: "0x76D85B4C0Fc497EeCc38902397aC608000A06607"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-1000-dai
+    network: goerli
+    source:
+      address: "0xCC84179FFD19A1627E79F8648d09e095252Bc418"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-10000-dai
+    network: goerli
+    source:
+      address: "0xD5d6f8D9e784d0e26222ad3834500801a68D027D"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-100000-dai
+    network: goerli
+    source:
+      address: "0x407CcEeaA7c95d2FE2250Bf9F2c105aA7AAFB512"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-5000-cdai
+    network: goerli
+    source:
+      address: "0x833481186f16Cece3f1Eeea1a694c42034c3a0dB"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-50000-cdai
+    network: goerli
+    source:
+      address: "0xd8D7DE3349ccaA0Fde6298fe6D7b7d0d34586193"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-500000-cdai
+    network: goerli
+    source:
+      address: "0x8281Aa6795aDE17C8973e1aedcA380258Bc124F9"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-5000000-cdai
+    network: goerli
+    source:
+      address: "0x57b2B8c82F065de8Ef5573f9730fC1449B403C9f"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-100-usdc
+    network: goerli
+    source:
+      address: "0x05E0b5B40B7b66098C2161A5EE11C5740A3A7C45"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-1000-usdc
+    network: goerli
+    source:
+      address: "0x23173fE8b96A4Ad8d2E17fB83EA5dcccdCa1Ae52"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-100-usdt
+    network: goerli
+    source:
+      address: "0x538Ab61E8A9fc1b2f93b3dd9011d662d89bE6FE6"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-1000-usdt
+    network: goerli
+    source:
+      address: "0x94Be88213a387E992Dd87DE56950a9aef34b9448"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-0.1-wbtc
+    network: goerli
+    source:
+      address: "0x242654336ca2205714071898f67E254EB49ACdCe"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-1-wbtc
+    network: goerli
+    source:
+      address: "0x776198CCF446DFa168347089d7338879273172cF"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-10-wbtc
+    network: goerli
+    source:
+      address: "0xeDC5d01286f99A066559F60a585406f3878a033e"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-0.1-eth
+    network: goerli
+    source:
+      address: "0x6Bf694a291DF3FeC1f7e69701E3ab6c592435Ae7"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-1-eth
+    network: goerli
+    source:
+      address: "0x3aac1cC67c2ec5Db4eA850957b967Ba153aD6279"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-10-eth
+    network: goerli
+    source:
+      address: "0x723B78e67497E85279CB204544566F4dC5d2acA0"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-100-eth
+    network: goerli
+    source:
+      address: "0x0E3A09dDA6B20aFbB34aC7cD4A6881493f3E7bf7"
+      abi: Instance
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Proxy
+    network: goerli
+    source:
+      address: "0x454d870a72e29d5e5697f635128d18077bd04c60"
+      abi: Proxy
+      startBlock: 3781595
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-encrypted-note.ts
+      entities:
+        - EncryptedNote
+      abis:
+        - name: Proxy
+          file: ../abis/Proxy.json
+      eventHandlers:
+        - event: EncryptedNote(indexed address,bytes)
+          handler: handleEncryptedNote
diff --git a/subgraphs/tornado-subgraph-mainnet.yaml b/subgraphs/tornado-subgraph-mainnet.yaml
index fd2f51e..e3ee5c8 100644
--- a/subgraphs/tornado-subgraph-mainnet.yaml
+++ b/subgraphs/tornado-subgraph-mainnet.yaml
@@ -116,6 +116,351 @@
           handler: handleDeposit
         - event: Withdrawal(address,bytes32,indexed address,uint256)
           handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-100-dai
+    network: mainnet
+    source:
+      address: "0xD4B88Df4D29F5CedD6857912842cff3b20C8Cfa3"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-1000-dai
+    network: mainnet
+    source:
+      address: "0xFD8610d20aA15b7B2E3Be39B396a1bC3516c7144"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-10000-dai
+    network: mainnet
+    source:
+      address: "0x07687e702b410Fa43f4cB4Af7FA097918ffD2730"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-100000-dai
+    network: mainnet
+    source:
+      address: "0x23773E65ed146A459791799d01336DB287f25334"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-5000-cdai
+    network: mainnet
+    source:
+      address: "0x22aaA7720ddd5388A3c0A3333430953C68f1849b"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-50000-cdai
+    network: mainnet
+    source:
+      address: "0x03893a7c7463AE47D46bc7f091665f1893656003"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-500000-cdai
+    network: mainnet
+    source:
+      address: "0x2717c5e28cf931547B621a5dddb772Ab6A35B701"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-5000000-cdai
+    network: mainnet
+    source:
+      address: "0xD21be7248e0197Ee08E0c20D4a96DEBdaC3D20Af"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-100-usdc
+    network: mainnet
+    source:
+      address: "0xd96f2B1c14Db8458374d9Aca76E26c3D18364307"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-1000-usdc
+    network: mainnet
+    source:
+      address: "0x4736dCf1b7A3d580672CcE6E7c65cd5cc9cFBa9D"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-100-usdt
+    network: mainnet
+    source:
+      address: "0x169AD27A470D064DEDE56a2D3ff727986b15D52B"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-1000-usdt
+    network: mainnet
+    source:
+      address: "0x0836222F2B2B24A3F36f98668Ed8F0B38D1a872f"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-0.1-wbtc
+    network: mainnet
+    source:
+      address: "0x178169B423a011fff22B9e3F3abeA13414dDD0F1"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-1-wbtc
+    network: mainnet
+    source:
+      address: "0x610B717796ad172B316836AC95a2ffad065CeaB4"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-10-wbtc
+    network: mainnet
+    source:
+      address: "0xbB93e510BbCD0B7beb5A853875f9eC60275CF498"
+      abi: Instance
+      startBlock: 9116966
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
   - kind: ethereum/contract
     name: Proxy
     network: mainnet