diff --git a/build/Instance/Instance.wasm b/build/Instance/Instance.wasm
index df6cec3..bc17bcc 100644
Binary files a/build/Instance/Instance.wasm and b/build/Instance/Instance.wasm differ
diff --git a/build/Proxy/Proxy.wasm b/build/Proxy/Proxy.wasm
index 575bfa3..a54d94b 100644
Binary files a/build/Proxy/Proxy.wasm and b/build/Proxy/Proxy.wasm differ
diff --git a/build/subgraph.yaml b/build/subgraph.yaml
index 71d5223..c8ae49d 100644
--- a/build/subgraph.yaml
+++ b/build/subgraph.yaml
@@ -1,67 +1,29 @@
 specVersion: 0.0.2
+description: Instance
+repository: https://github.com/tornadocash/tornado-subgraph
 schema:
   file: schema.graphql
 dataSources:
-  - kind: ethereum/contract
-    name: Proxy
-    network: bsc
-    source:
-      address: "0x5D595DB16eb6d074E0e7E7f0bE37E7e75f23BEc7"
-      abi: Proxy
-      startBlock: 7941563
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.4
-      language: wasm/assemblyscript
-      entities:
-        - EncryptedNote
-      abis:
-        - name: Proxy
-          file: Proxy/abis/Proxy.json
-      eventHandlers:
-        - event: EncryptedNote(indexed address,bytes)
-          handler: handleEncryptedNote
-      file: Proxy/Proxy.wasm
-  - kind: ethereum/contract
-    name: Echoer
-    network: bsc
-    source:
-      address: "0x60eaCBd5535ADB86955A0154E44Aded78F161643"
-      abi: Echoer
-      startBlock: 7941563
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.4
-      language: wasm/assemblyscript
-      entities:
-        - NoteAccount
-      abis:
-        - name: Echoer
-          file: Echoer/abis/Echoer.json
-      eventHandlers:
-        - event: Echo(indexed address,bytes)
-          handler: handleEcho
-      file: Echoer/Echoer.wasm
   - kind: ethereum/contract
     name: Instance
     network: bsc
     source:
       address: "0x0Ce22770451A8acAD1220D9d1678656b4fAe4a1d"
       abi: Instance
-      startBlock: 7941563
+      startBlock: 7942402
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.4
       language: wasm/assemblyscript
+      file: Instance/Instance.wasm
       entities:
         - Deposit
         - Withdrawal
       abis:
         - name: Instance
-          file: Instance/abis/Instance.json
+          file: abis/Instance.json
       eventHandlers:
         - event: Deposit(indexed bytes32,uint32,uint256)
           handler: handleDeposit
         - event: Withdrawal(address,bytes32,indexed address,uint256)
           handler: handleWithdrawal
-      file: Instance/Instance.wasm
diff --git a/package.json b/package.json
index 8a22887..7f79a3d 100644
--- a/package.json
+++ b/package.json
@@ -2,12 +2,14 @@
   "name": "sub-graph-proxy",
   "license": "UNLICENSED",
   "scripts": {
-    "codegen": "graph codegen",
-    "build": "graph build",
     "yaml:proxy": "node ./create-yaml-file create-yaml -s proxy -e bsc | mustache - mustache/yaml.mustache > subgraphs/proxy-tornado-subgraph.yaml",
     "yaml:instance": "node ./create-yaml-file create-yaml -s instance -e bsc | mustache - mustache/yaml.mustache > subgraphs/instance-tornado-subgraph.yaml",
+    "codegen": "graph codegen",
     "codegen:proxy": "yarn yaml:proxy && yarn codegen -- subgraphs/proxy-tornado-subgraph.yaml",
     "codegen:instance": "yarn yaml:instance && yarn codegen -- subgraphs/instance-tornado-subgraph.yaml",
+    "build": "graph build",
+    "build:proxy": "graph build subgraphs/proxy-tornado-subgraph.yaml",
+    "build:instance": "graph build subgraphs/instance-tornado-subgraph.yaml",
     "deploy": "graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ tornadocash/bsc-tornado-subgraph"
   },
   "dependencies": {