diff --git a/package.json b/package.json
index b2620918ed..c9e271eaee 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@babel/core": "^7.16.5",
     "@babel/register": "^7.16.5",
     "@babel/runtime": "^7.16.5",
-    "@polkadot/dev": "^0.64.15",
+    "@polkadot/dev": "^0.64.18",
     "@polkadot/ts": "^0.4.22",
     "@polkadot/typegen": "workspace:packages/typegen",
     "@types/jest": "^27.0.3",
diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json
index 6495a2948a..437c098f7f 100644
--- a/packages/api-contract/package.json
+++ b/packages/api-contract/package.json
@@ -26,9 +26,14 @@
     "@babel/runtime": "^7.16.5",
     "@polkadot/api": "7.0.3-5",
     "@polkadot/types": "7.0.3-5",
+    "@polkadot/types-codec": "7.0.3-5",
     "@polkadot/types-create": "7.0.3-5",
     "@polkadot/util": "^8.2.2",
     "@polkadot/util-crypto": "^8.2.2",
     "rxjs": "^7.4.0"
+  },
+  "devDependencies": {
+    "@polkadot/api-augment": "7.0.3-5",
+    "@polkadot/keyring": "^8.2.2"
   }
 }
diff --git a/packages/api-contract/tsconfig.json b/packages/api-contract/tsconfig.json
index dd6d6d290b..083167de7e 100644
--- a/packages/api-contract/tsconfig.json
+++ b/packages/api-contract/tsconfig.json
@@ -16,6 +16,7 @@
   "references": [
     { "path": "../api" },
     { "path": "../types" },
+    { "path": "../types-codec" },
     { "path": "../types-create" }
   ]
 }
diff --git a/packages/api-contract/tsconfig.spec.json b/packages/api-contract/tsconfig.spec.json
index a8934a6170..b5f2d9ac9a 100644
--- a/packages/api-contract/tsconfig.spec.json
+++ b/packages/api-contract/tsconfig.spec.json
@@ -18,6 +18,7 @@
   ],
   "references": [
     { "path": "../api" },
+    { "path": "../api-augment" },
     { "path": "../api-contract" },
     { "path": "../types" }
   ]
diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
index 04392c4267..92ecc979bb 100644
--- a/packages/api-derive/package.json
+++ b/packages/api-derive/package.json
@@ -37,6 +37,8 @@
   "devDependencies": {
     "@polkadot/api": "7.0.3-5",
     "@polkadot/api-augment": "7.0.3-5",
-    "@polkadot/rpc-augment": "7.0.3-5"
+    "@polkadot/rpc-augment": "7.0.3-5",
+    "@polkadot/rpc-provider": "7.0.3-5",
+    "@polkadot/types-support": "7.0.3-5"
   }
 }
diff --git a/packages/api-derive/tsconfig.spec.json b/packages/api-derive/tsconfig.spec.json
index 0675acdfce..ec4e419a9d 100644
--- a/packages/api-derive/tsconfig.spec.json
+++ b/packages/api-derive/tsconfig.spec.json
@@ -18,9 +18,10 @@
     { "path": "../api-base" },
     { "path": "../api-derive" },
     { "path": "../rpc-augment" },
+    { "path": "../rpc-provider" },
     { "path": "../types" },
     { "path": "../types-augment" },
     { "path": "../types-codec" },
-    { "path": "../types-support" },
+    { "path": "../types-support" }
   ]
 }
diff --git a/packages/api/package.json b/packages/api/package.json
index 3ac3169cff..6b27f26ff7 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -42,6 +42,7 @@
     "rxjs": "^7.4.0"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "7.0.3-5"
+    "@polkadot/api-augment": "7.0.3-5",
+    "@polkadot/types-support": "7.0.3-5"
   }
 }
diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json
index 8fa823eb7b..0976fad6c9 100644
--- a/packages/api/tsconfig.json
+++ b/packages/api/tsconfig.json
@@ -17,6 +17,7 @@
     { "path": "../rpc-core" },
     { "path": "../rpc-provider" },
     { "path": "../types" },
+    { "path": "../types-codec" },
     { "path": "../types-known" }
   ]
 }
diff --git a/packages/api/tsconfig.spec.json b/packages/api/tsconfig.spec.json
index d4865479d3..dccec775ca 100644
--- a/packages/api/tsconfig.spec.json
+++ b/packages/api/tsconfig.spec.json
@@ -20,6 +20,7 @@
     { "path": "../rpc-core" },
     { "path": "../rpc-provider" },
     { "path": "../types" },
-    { "path": "../types-known" }
+    { "path": "../types-known" },
+    { "path": "../types-support" }
   ]
 }
diff --git a/packages/types-codec/package.json b/packages/types-codec/package.json
index ad9ba06200..39979a4e31 100644
--- a/packages/types-codec/package.json
+++ b/packages/types-codec/package.json
@@ -27,6 +27,9 @@
     "@polkadot/util": "^8.2.2"
   },
   "devDependencies": {
-    "@polkadot/types": "^7.0.3-5"
+    "@polkadot/types": "^7.0.3-5",
+    "@polkadot/types-augment": "^7.0.3-5",
+    "@polkadot/types-support": "^7.0.3-5",
+    "@polkadot/util-crypto": "^8.2.2"
   }
 }
diff --git a/packages/types-create/package.json b/packages/types-create/package.json
index 220082b8ae..93b0edabf3 100644
--- a/packages/types-create/package.json
+++ b/packages/types-create/package.json
@@ -26,5 +26,8 @@
     "@babel/runtime": "^7.16.5",
     "@polkadot/types-codec": "7.0.3-5",
     "@polkadot/util": "^8.2.2"
+  },
+  "devDependencies": {
+    "@polkadot/types": "^7.0.3-5"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c2ef5d77c5..e82f1745cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1899,7 +1899,10 @@ __metadata:
   dependencies:
     "@babel/runtime": ^7.16.5
     "@polkadot/api": 7.0.3-5
+    "@polkadot/api-augment": 7.0.3-5
+    "@polkadot/keyring": ^8.2.2
     "@polkadot/types": 7.0.3-5
+    "@polkadot/types-codec": 7.0.3-5
     "@polkadot/types-create": 7.0.3-5
     "@polkadot/util": ^8.2.2
     "@polkadot/util-crypto": ^8.2.2
@@ -1917,8 +1920,10 @@ __metadata:
     "@polkadot/api-base": 7.0.3-5
     "@polkadot/rpc-augment": 7.0.3-5
     "@polkadot/rpc-core": 7.0.3-5
+    "@polkadot/rpc-provider": 7.0.3-5
     "@polkadot/types": 7.0.3-5
     "@polkadot/types-codec": 7.0.3-5
+    "@polkadot/types-support": 7.0.3-5
     "@polkadot/util": ^8.2.2
     "@polkadot/util-crypto": ^8.2.2
     rxjs: ^7.4.0
@@ -1942,6 +1947,7 @@ __metadata:
     "@polkadot/types-codec": 7.0.3-5
     "@polkadot/types-create": 7.0.3-5
     "@polkadot/types-known": 7.0.3-5
+    "@polkadot/types-support": 7.0.3-5
     "@polkadot/util": ^8.2.2
     "@polkadot/util-crypto": ^8.2.2
     eventemitter3: ^4.0.7
@@ -1949,9 +1955,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/dev@npm:^0.64.15":
-  version: 0.64.15
-  resolution: "@polkadot/dev@npm:0.64.15"
+"@polkadot/dev@npm:^0.64.18":
+  version: 0.64.18
+  resolution: "@polkadot/dev@npm:0.64.18"
   dependencies:
     "@babel/cli": ^7.16.0
     "@babel/core": ^7.16.5
@@ -2036,7 +2042,7 @@ __metadata:
     polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs
     polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs
     polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs
-  checksum: 4f866be68acf54d36a7428e6a05d698b51d7db5409e64a72a59bae3f11794fb3a44639054fe06dc052533c8df4eec8a21ae70dd490310c31dfe1990437555a0c
+  checksum: 9e5fc2c65bf2132422e103caa34c194b6c6d731997200cb72893634be3c1656a16f27a698c316ead92984470eaecc301594043b21a8aad270e5678983d7953f1
   languageName: node
   linkType: hard
 
@@ -2173,7 +2179,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-augment@7.0.3-5, @polkadot/types-augment@workspace:packages/types-augment":
+"@polkadot/types-augment@7.0.3-5, @polkadot/types-augment@^7.0.3-5, @polkadot/types-augment@workspace:packages/types-augment":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-augment@workspace:packages/types-augment"
   dependencies:
@@ -2190,7 +2196,10 @@ __metadata:
   dependencies:
     "@babel/runtime": ^7.16.5
     "@polkadot/types": ^7.0.3-5
+    "@polkadot/types-augment": ^7.0.3-5
+    "@polkadot/types-support": ^7.0.3-5
     "@polkadot/util": ^8.2.2
+    "@polkadot/util-crypto": ^8.2.2
   languageName: unknown
   linkType: soft
 
@@ -2199,6 +2208,7 @@ __metadata:
   resolution: "@polkadot/types-create@workspace:packages/types-create"
   dependencies:
     "@babel/runtime": ^7.16.5
+    "@polkadot/types": ^7.0.3-5
     "@polkadot/types-codec": 7.0.3-5
     "@polkadot/util": ^8.2.2
   languageName: unknown
@@ -2217,7 +2227,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-support@7.0.3-5, @polkadot/types-support@workspace:packages/types-support":
+"@polkadot/types-support@7.0.3-5, @polkadot/types-support@^7.0.3-5, @polkadot/types-support@workspace:packages/types-support":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-support@workspace:packages/types-support"
   dependencies:
@@ -9008,7 +9018,7 @@ resolve@^2.0.0-next.3:
     "@babel/core": ^7.16.5
     "@babel/register": ^7.16.5
     "@babel/runtime": ^7.16.5
-    "@polkadot/dev": ^0.64.15
+    "@polkadot/dev": ^0.64.18
     "@polkadot/ts": ^0.4.22
     "@polkadot/typegen": "workspace:packages/typegen"
     "@types/jest": ^27.0.3