diff --git a/lerna.json b/lerna.json
index e5703e4c..6998ea50 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.2.15",
+  "version": "0.2.16",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {
diff --git a/package.json b/package.json
index 68f70a73..0def6964 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,12 @@
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": {
-    "packages": ["packages/*"],
-    "nohoist": ["**/@graphprotocol/graph-ts"]
+    "packages": [
+      "packages/*"
+    ],
+    "nohoist": [
+      "**/@graphprotocol/graph-ts"
+    ]
   },
   "devDependencies": {
     "depcheck": "^1.4.2",
diff --git a/packages/address-watcher/package.json b/packages/address-watcher/package.json
index 4aa68ad7..686158f9 100644
--- a/packages/address-watcher/package.json
+++ b/packages/address-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/address-watcher",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "Address Watcher",
   "private": true,
   "scripts": {
@@ -26,11 +26,11 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cache": "^0.2.15",
-    "@cerc-io/ipld-eth-client": "^0.2.15",
-    "@cerc-io/solidity-mapper": "^0.2.15",
-    "@cerc-io/tracing-client": "^0.2.15",
-    "@cerc-io/util": "^0.2.15",
+    "@cerc-io/cache": "^0.2.16",
+    "@cerc-io/ipld-eth-client": "^0.2.16",
+    "@cerc-io/solidity-mapper": "^0.2.16",
+    "@cerc-io/tracing-client": "^0.2.16",
+    "@cerc-io/util": "^0.2.16",
     "@types/lodash": "^4.14.168",
     "debug": "^4.3.1",
     "ethers": "^5.4.4",
diff --git a/packages/cache/package.json b/packages/cache/package.json
index 68257cd9..5cec2464 100644
--- a/packages/cache/package.json
+++ b/packages/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/cache",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "Generic object cache",
   "main": "dist/index.js",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index b1f94d0b..494fa4bd 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/cli",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "scripts": {
@@ -10,18 +10,18 @@
     "copy-assets": "copyfiles -u 1 src/**/*.gql dist/"
   },
   "dependencies": {
-    "@cerc-io/ipld-eth-client": "^0.2.15",
-    "@cerc-io/util": "^0.2.15",
+    "@cerc-io/ipld-eth-client": "^0.2.16",
+    "@cerc-io/util": "^0.2.16",
     "@ethersproject/providers": "^5.4.4",
     "@graphql-tools/utils": "^9.1.1",
     "@ipld/dag-cbor": "^6.0.12",
-    "reflect-metadata": "^0.1.13",
-    "typeorm": "^0.2.32",
-    "yargs": "^17.0.1",
-    "graphql-subscriptions": "^2.0.0",
+    "apollo-server-express": "^3.11.1",
     "debug": "^4.3.1",
     "express": "^4.18.2",
-    "apollo-server-express": "^3.11.1"
+    "graphql-subscriptions": "^2.0.0",
+    "reflect-metadata": "^0.1.13",
+    "typeorm": "^0.2.32",
+    "yargs": "^17.0.1"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^4.25.0",
diff --git a/packages/codegen/package.json b/packages/codegen/package.json
index 15d28267..ecfb82e7 100644
--- a/packages/codegen/package.json
+++ b/packages/codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/codegen",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "Code generator",
   "private": true,
   "main": "index.js",
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
-    "@cerc-io/util": "^0.2.15",
+    "@cerc-io/util": "^0.2.16",
     "@graphql-tools/load-files": "^6.5.2",
     "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",
     "@solidity-parser/parser": "^0.13.2",
diff --git a/packages/eden-watcher/package.json b/packages/eden-watcher/package.json
index 611f2744..dee70d9e 100644
--- a/packages/eden-watcher/package.json
+++ b/packages/eden-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/eden-watcher",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "eden-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,11 +38,11 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.15",
-    "@cerc-io/graph-node": "^0.2.15",
-    "@cerc-io/ipld-eth-client": "^0.2.15",
-    "@cerc-io/solidity-mapper": "^0.2.15",
-    "@cerc-io/util": "^0.2.15",
+    "@cerc-io/cli": "^0.2.16",
+    "@cerc-io/graph-node": "^0.2.16",
+    "@cerc-io/ipld-eth-client": "^0.2.16",
+    "@cerc-io/solidity-mapper": "^0.2.16",
+    "@cerc-io/util": "^0.2.16",
     "@ethersproject/providers": "^5.4.4",
     "@ipld/dag-cbor": "^6.0.12",
     "apollo-type-bigint": "^0.1.3",
diff --git a/packages/erc20-watcher/package.json b/packages/erc20-watcher/package.json
index 55488128..d71796ad 100644
--- a/packages/erc20-watcher/package.json
+++ b/packages/erc20-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/erc20-watcher",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "ERC20 Watcher",
   "private": true,
   "main": "dist/index.js",
@@ -40,10 +40,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.15",
-    "@cerc-io/ipld-eth-client": "^0.2.15",
-    "@cerc-io/solidity-mapper": "^0.2.15",
-    "@cerc-io/util": "^0.2.15",
+    "@cerc-io/cli": "^0.2.16",
+    "@cerc-io/ipld-eth-client": "^0.2.16",
+    "@cerc-io/solidity-mapper": "^0.2.16",
+    "@cerc-io/util": "^0.2.16",
     "@ethersproject/providers": "^5.4.4",
     "@types/express": "^4.17.14",
     "@types/lodash": "^4.14.168",
diff --git a/packages/erc721-watcher/package.json b/packages/erc721-watcher/package.json
index fea96f07..b29a08f5 100644
--- a/packages/erc721-watcher/package.json
+++ b/packages/erc721-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/erc721-watcher",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "erc721-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -46,10 +46,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.15",
-    "@cerc-io/ipld-eth-client": "^0.2.15",
-    "@cerc-io/solidity-mapper": "^0.2.15",
-    "@cerc-io/util": "^0.2.15",
+    "@cerc-io/cli": "^0.2.16",
+    "@cerc-io/ipld-eth-client": "^0.2.16",
+    "@cerc-io/solidity-mapper": "^0.2.16",
+    "@cerc-io/util": "^0.2.16",
     "@ethersproject/providers": "^5.4.4",
     "@ipld/dag-cbor": "^6.0.12",
     "apollo-type-bigint": "^0.1.3",
diff --git a/packages/graph-node/package.json b/packages/graph-node/package.json
index a632deaf..09409b53 100644
--- a/packages/graph-node/package.json
+++ b/packages/graph-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/graph-node",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -48,8 +48,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/ipld-eth-client": "^0.2.15",
-    "@cerc-io/util": "^0.2.15",
+    "@cerc-io/ipld-eth-client": "^0.2.16",
+    "@cerc-io/util": "^0.2.16",
     "@types/json-diff": "^0.5.2",
     "@vulcanize/assemblyscript": "0.0.1",
     "bn.js": "^4.11.9",
diff --git a/packages/graph-test-watcher/package.json b/packages/graph-test-watcher/package.json
index fdcfb201..3ae637e1 100644
--- a/packages/graph-test-watcher/package.json
+++ b/packages/graph-test-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/graph-test-watcher",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "graph-test-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -38,11 +38,11 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.15",
-    "@cerc-io/graph-node": "^0.2.15",
-    "@cerc-io/ipld-eth-client": "^0.2.15",
-    "@cerc-io/solidity-mapper": "^0.2.15",
-    "@cerc-io/util": "^0.2.15",
+    "@cerc-io/cli": "^0.2.16",
+    "@cerc-io/graph-node": "^0.2.16",
+    "@cerc-io/ipld-eth-client": "^0.2.16",
+    "@cerc-io/solidity-mapper": "^0.2.16",
+    "@cerc-io/util": "^0.2.16",
     "@ethersproject/providers": "^5.4.4",
     "@ipld/dag-cbor": "^6.0.12",
     "apollo-type-bigint": "^0.1.3",
diff --git a/packages/ipld-eth-client/package.json b/packages/ipld-eth-client/package.json
index 7abec8fe..d28abd81 100644
--- a/packages/ipld-eth-client/package.json
+++ b/packages/ipld-eth-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/ipld-eth-client",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "IPLD ETH Client",
   "main": "dist/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@cerc-io/cache": "^0.2.15",
+    "@cerc-io/cache": "^0.2.16",
     "cross-fetch": "^3.1.4",
     "debug": "^4.3.1",
     "ethers": "^5.4.4",
diff --git a/packages/mobymask-watcher/package.json b/packages/mobymask-watcher/package.json
index 32c19780..e092114d 100644
--- a/packages/mobymask-watcher/package.json
+++ b/packages/mobymask-watcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/mobymask-watcher",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "mobymask-watcher",
   "private": true,
   "main": "dist/index.js",
@@ -37,10 +37,10 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.15",
-    "@cerc-io/ipld-eth-client": "^0.2.15",
-    "@cerc-io/solidity-mapper": "^0.2.15",
-    "@cerc-io/util": "^0.2.15",
+    "@cerc-io/cli": "^0.2.16",
+    "@cerc-io/ipld-eth-client": "^0.2.16",
+    "@cerc-io/solidity-mapper": "^0.2.16",
+    "@cerc-io/util": "^0.2.16",
     "@ethersproject/providers": "^5.4.4",
     "@ipld/dag-cbor": "^6.0.12",
     "apollo-type-bigint": "^0.1.3",
diff --git a/packages/solidity-mapper/package.json b/packages/solidity-mapper/package.json
index 41b74e82..c8600780 100644
--- a/packages/solidity-mapper/package.json
+++ b/packages/solidity-mapper/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@cerc-io/solidity-mapper",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@cerc-io/ipld-eth-client": "^0.2.15",
+    "@cerc-io/ipld-eth-client": "^0.2.16",
     "@ethersproject/abi": "^5.3.0",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
diff --git a/packages/test/package.json b/packages/test/package.json
index 58e1184e..d7f77b8e 100644
--- a/packages/test/package.json
+++ b/packages/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/test",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "private": true,
diff --git a/packages/tracing-client/package.json b/packages/tracing-client/package.json
index 703854f7..49a5420a 100644
--- a/packages/tracing-client/package.json
+++ b/packages/tracing-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/tracing-client",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "ETH VM tracing client",
   "private": true,
   "main": "dist/index.js",
diff --git a/packages/util/package.json b/packages/util/package.json
index cb97d18d..820db202 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@cerc-io/util",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "dependencies": {
     "@apollo/utils.keyvaluecache": "^1.0.1",
-    "@cerc-io/solidity-mapper": "^0.2.15",
+    "@cerc-io/solidity-mapper": "^0.2.16",
     "@ethersproject/providers": "^5.4.4",
     "@graphql-tools/schema": "^9.0.10",
     "@graphql-tools/utils": "^9.1.1",
@@ -20,23 +20,23 @@
     "express-queue": "^0.0.13",
     "fs-extra": "^10.0.0",
     "graphql": "^15.5.0",
+    "graphql-subscriptions": "^2.0.0",
     "graphql-ws": "^5.11.2",
     "ipfs-http-client": "^56.0.3",
+    "json-bigint": "^1.0.0",
     "lodash": "^4.17.21",
     "multiformats": "^9.4.8",
     "pg": "^8.5.1",
     "pg-boss": "^6.1.0",
     "prom-client": "^14.0.1",
     "toml": "^3.0.0",
-    "ws": "^8.11.0",
     "typeorm": "^0.2.32",
     "typeorm-naming-strategies": "^2.0.0",
-    "graphql-subscriptions": "^2.0.0",
-    "json-bigint": "^1.0.0"
+    "ws": "^8.11.0"
   },
   "devDependencies": {
-    "@cerc-io/cache": "^0.2.15",
-    "@cerc-io/ipld-eth-client": "^0.2.15",
+    "@cerc-io/cache": "^0.2.16",
+    "@cerc-io/ipld-eth-client": "^0.2.16",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@types/express": "^4.17.14",
     "@types/fs-extra": "^9.0.11",