diff --git a/lerna.json b/lerna.json
index c155725b0d..a6be86d30a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -9,5 +9,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.96.0-beta.27"
+  "version": "0.96.0-beta.28"
 }
diff --git a/package.json b/package.json
index 83330b2b1c..2d4eba249e 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.96.0-beta.27",
+  "version": "0.96.0-beta.28",
   "private": true,
   "engines": {
     "yarn": "^1.10.1"
diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json
index 94921af343..6dec989b47 100644
--- a/packages/api-contract/package.json
+++ b/packages/api-contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "0.96.0-beta.27",
+  "version": "0.96.0-beta.28",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
   "keywords": [
@@ -27,6 +27,6 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
   "dependencies": {
     "@babel/runtime": "^7.6.3",
-    "@polkadot/types": "^0.96.0-beta.27"
+    "@polkadot/types": "^0.96.0-beta.28"
   }
 }
diff --git a/packages/api-contract/test/compare/erc20.test.json b/packages/api-contract/test/compare/erc20.test.json
index aec67603af..dd62a01635 100644
--- a/packages/api-contract/test/compare/erc20.test.json
+++ b/packages/api-contract/test/compare/erc20.test.json
@@ -1,15 +1,15 @@
 [
   {
     "info": 9,
-    "type": "{ \"total_supply\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u128>\"} }<u128>\", \"balances\": \"{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\"} }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\"} }<([u8;32]), u128>)\", \"Removed\": \"Null\"} }<([u8;32]), u128>>\"} }<([u8;32]), u128>\", \"allowances\": \"{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\"} }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"} }<(AccountId, AccountId), u128>>\"} }<(AccountId, AccountId), u128>\"} }",
+    "type": "{ \"total_supply\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u128>\" }<u128>\", \"balances\": \"{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }<([u8;32]), u128>>\" }<([u8;32]), u128>\", \"allowances\": \"{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }<(AccountId, AccountId), u128>>\" }<(AccountId, AccountId), u128>\" }",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u128>\"} }",
+        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u128>\" }",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"([u8;32])\"} }",
+            "type": "{ \"cell\": \"([u8;32])\" }",
             "sub": [
               {
                 "info": 10,
@@ -54,15 +54,15 @@
       },
       {
         "info": 9,
-        "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\"} }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\"} }<([u8;32]), u128>)\", \"Removed\": \"Null\"} }<([u8;32]), u128>>\"} }",
+        "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }<([u8;32]), u128>>\" }",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }",
+            "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"cell\": \"([u8;32])\"} }",
+                "type": "{ \"cell\": \"([u8;32])\" }",
                 "sub": [
                   {
                     "info": 10,
@@ -107,7 +107,7 @@
           },
           {
             "info": 9,
-            "type": "{ \"cells_key\": \"([u8;32])\"} }",
+            "type": "{ \"cells_key\": \"([u8;32])\" }",
             "sub": [
               {
                 "info": 10,
@@ -136,7 +136,7 @@
             "params": [
               {
                 "info": 3,
-                "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\"} }<([u8;32]), u128>)\", \"Removed\": \"Null\"} }",
+                "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }",
                 "sub": [
                   {
                     "info": 10,
@@ -144,7 +144,7 @@
                     "sub": [
                       {
                         "info": 9,
-                        "type": "{ \"key\": \"AccountId\", \"val\": \"u128\"} }",
+                        "type": "{ \"key\": \"AccountId\", \"val\": \"u128\" }",
                         "sub": [
                           {
                             "info": 10,
@@ -205,7 +205,7 @@
                         "index": 0
                       }
                     ],
-                    "type": "({ \"key\": \"AccountId\", \"val\": \"u128\"} }<([u8;32]), u128>)"
+                    "type": "({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)"
                   },
                   {
                     "info": 6,
@@ -278,15 +278,15 @@
       },
       {
         "info": 9,
-        "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\"} }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"} }<(AccountId, AccountId), u128>>\"} }",
+        "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }<(AccountId, AccountId), u128>>\" }",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }",
+            "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"cell\": \"([u8;32])\"} }",
+                "type": "{ \"cell\": \"([u8;32])\" }",
                 "sub": [
                   {
                     "info": 10,
@@ -331,7 +331,7 @@
           },
           {
             "info": 9,
-            "type": "{ \"cells_key\": \"([u8;32])\"} }",
+            "type": "{ \"cells_key\": \"([u8;32])\" }",
             "sub": [
               {
                 "info": 10,
@@ -360,7 +360,7 @@
             "params": [
               {
                 "info": 3,
-                "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"} }",
+                "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }",
                 "sub": [
                   {
                     "info": 10,
@@ -368,7 +368,7 @@
                     "sub": [
                       {
                         "info": 9,
-                        "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }",
+                        "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }",
                         "sub": [
                           {
                             "info": 10,
@@ -484,7 +484,7 @@
                         "index": 0
                       }
                     ],
-                    "type": "({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }<(AccountId, AccountId), u128>)"
+                    "type": "({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)"
                   },
                   {
                     "info": 6,
@@ -615,11 +615,11 @@
   },
   {
     "info": 9,
-    "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u128>\"} }",
+    "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u128>\" }",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"([u8;32])\"} }",
+        "type": "{ \"cell\": \"([u8;32])\" }",
         "sub": [
           {
             "info": 10,
@@ -668,7 +668,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cell\": \"([u8;32])\"} }",
+    "type": "{ \"cell\": \"([u8;32])\" }",
     "sub": [
       {
         "info": 10,
@@ -740,15 +740,15 @@
   },
   {
     "info": 9,
-    "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\"} }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\"} }<([u8;32]), u128>)\", \"Removed\": \"Null\"} }<([u8;32]), u128>>\"} }",
+    "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }<([u8;32]), u128>>\" }",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }",
+        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"([u8;32])\"} }",
+            "type": "{ \"cell\": \"([u8;32])\" }",
             "sub": [
               {
                 "info": 10,
@@ -793,7 +793,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"cells_key\": \"([u8;32])\"} }",
+        "type": "{ \"cells_key\": \"([u8;32])\" }",
         "sub": [
           {
             "info": 10,
@@ -822,7 +822,7 @@
         "params": [
           {
             "info": 3,
-            "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\"} }<([u8;32]), u128>)\", \"Removed\": \"Null\"} }",
+            "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }",
             "sub": [
               {
                 "info": 10,
@@ -830,7 +830,7 @@
                 "sub": [
                   {
                     "info": 9,
-                    "type": "{ \"key\": \"AccountId\", \"val\": \"u128\"} }",
+                    "type": "{ \"key\": \"AccountId\", \"val\": \"u128\" }",
                     "sub": [
                       {
                         "info": 10,
@@ -891,7 +891,7 @@
                     "index": 0
                   }
                 ],
-                "type": "({ \"key\": \"AccountId\", \"val\": \"u128\"} }<([u8;32]), u128>)"
+                "type": "({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)"
               },
               {
                 "info": 6,
@@ -985,11 +985,11 @@
   },
   {
     "info": 9,
-    "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }",
+    "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"([u8;32])\"} }",
+        "type": "{ \"cell\": \"([u8;32])\" }",
         "sub": [
           {
             "info": 10,
@@ -1038,7 +1038,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cell\": \"([u8;32])\"} }",
+    "type": "{ \"cell\": \"([u8;32])\" }",
     "sub": [
       {
         "info": 10,
@@ -1073,7 +1073,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cells_key\": \"([u8;32])\"} }",
+    "type": "{ \"cells_key\": \"([u8;32])\" }",
     "sub": [
       {
         "info": 10,
@@ -1102,7 +1102,7 @@
     "params": [
       {
         "info": 3,
-        "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\"} }<([u8;32]), u128>)\", \"Removed\": \"Null\"} }",
+        "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }",
         "sub": [
           {
             "info": 10,
@@ -1110,7 +1110,7 @@
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"key\": \"AccountId\", \"val\": \"u128\"} }",
+                "type": "{ \"key\": \"AccountId\", \"val\": \"u128\" }",
                 "sub": [
                   {
                     "info": 10,
@@ -1171,7 +1171,7 @@
                 "index": 0
               }
             ],
-            "type": "({ \"key\": \"AccountId\", \"val\": \"u128\"} }<([u8;32]), u128>)"
+            "type": "({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)"
           },
           {
             "info": 6,
@@ -1213,7 +1213,7 @@
   },
   {
     "info": 3,
-    "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\"} }<([u8;32]), u128>)\", \"Removed\": \"Null\"} }",
+    "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }",
     "sub": [
       {
         "info": 10,
@@ -1221,7 +1221,7 @@
         "sub": [
           {
             "info": 9,
-            "type": "{ \"key\": \"AccountId\", \"val\": \"u128\"} }",
+            "type": "{ \"key\": \"AccountId\", \"val\": \"u128\" }",
             "sub": [
               {
                 "info": 10,
@@ -1282,7 +1282,7 @@
             "index": 0
           }
         ],
-        "type": "({ \"key\": \"AccountId\", \"val\": \"u128\"} }<([u8;32]), u128>)"
+        "type": "({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)"
       },
       {
         "info": 6,
@@ -1322,7 +1322,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"key\": \"AccountId\", \"val\": \"u128\"} }",
+    "type": "{ \"key\": \"AccountId\", \"val\": \"u128\" }",
     "sub": [
       {
         "info": 10,
@@ -1383,15 +1383,15 @@
   },
   {
     "info": 9,
-    "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\"} }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"} }<(AccountId, AccountId), u128>>\"} }",
+    "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }<(AccountId, AccountId), u128>>\" }",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }",
+        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"([u8;32])\"} }",
+            "type": "{ \"cell\": \"([u8;32])\" }",
             "sub": [
               {
                 "info": 10,
@@ -1436,7 +1436,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"cells_key\": \"([u8;32])\"} }",
+        "type": "{ \"cells_key\": \"([u8;32])\" }",
         "sub": [
           {
             "info": 10,
@@ -1465,7 +1465,7 @@
         "params": [
           {
             "info": 3,
-            "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"} }",
+            "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }",
             "sub": [
               {
                 "info": 10,
@@ -1473,7 +1473,7 @@
                 "sub": [
                   {
                     "info": 9,
-                    "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }",
+                    "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }",
                     "sub": [
                       {
                         "info": 10,
@@ -1589,7 +1589,7 @@
                     "index": 0
                   }
                 ],
-                "type": "({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }<(AccountId, AccountId), u128>)"
+                "type": "({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)"
               },
               {
                 "info": 6,
@@ -1764,7 +1764,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cells_key\": \"([u8;32])\"} }",
+    "type": "{ \"cells_key\": \"([u8;32])\" }",
     "sub": [
       {
         "info": 10,
@@ -1793,7 +1793,7 @@
     "params": [
       {
         "info": 3,
-        "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"} }",
+        "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }",
         "sub": [
           {
             "info": 10,
@@ -1801,7 +1801,7 @@
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }",
+                "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }",
                 "sub": [
                   {
                     "info": 10,
@@ -1917,7 +1917,7 @@
                 "index": 0
               }
             ],
-            "type": "({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }<(AccountId, AccountId), u128>)"
+            "type": "({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)"
           },
           {
             "info": 6,
@@ -1986,7 +1986,7 @@
   },
   {
     "info": 3,
-    "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"} }",
+    "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }",
     "sub": [
       {
         "info": 10,
@@ -1994,7 +1994,7 @@
         "sub": [
           {
             "info": 9,
-            "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }",
+            "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }",
             "sub": [
               {
                 "info": 10,
@@ -2110,7 +2110,7 @@
             "index": 0
           }
         ],
-        "type": "({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }<(AccountId, AccountId), u128>)"
+        "type": "({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)"
       },
       {
         "info": 6,
@@ -2177,7 +2177,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\"} }",
+    "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }",
     "sub": [
       {
         "info": 10,
diff --git a/packages/api-contract/test/compare/shared-vec.test.json b/packages/api-contract/test/compare/shared-vec.test.json
index c7b8677a59..1b36f3fef9 100644
--- a/packages/api-contract/test/compare/shared-vec.test.json
+++ b/packages/api-contract/test/compare/shared-vec.test.json
@@ -1,19 +1,19 @@
 [
   {
     "info": 9,
-    "type": "{ \"mutators\": \"{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\"} }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>)\", \"Removed\": \"Null\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>>\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>\", \"vec\": \"{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\", \"cells\": \"{ \"cells_key\": \"([u8;32])\"} }<i32>\"} }<i32>\"} }",
+    "type": "{ \"mutators\": \"{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>>\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>\", \"vec\": \"{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"cells\": \"{ \"cells_key\": \"([u8;32])\" }<i32>\" }<i32>\" }",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\"} }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>)\", \"Removed\": \"Null\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>>\"} }",
+        "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>>\" }",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }",
+            "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"cell\": \"([u8;32])\"} }",
+                "type": "{ \"cell\": \"([u8;32])\" }",
                 "sub": [
                   {
                     "info": 10,
@@ -58,7 +58,7 @@
           },
           {
             "info": 9,
-            "type": "{ \"cells_key\": \"([u8;32])\"} }",
+            "type": "{ \"cells_key\": \"([u8;32])\" }",
             "sub": [
               {
                 "info": 10,
@@ -87,7 +87,7 @@
             "params": [
               {
                 "info": 3,
-                "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>)\", \"Removed\": \"Null\"} }",
+                "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }",
                 "sub": [
                   {
                     "info": 10,
@@ -95,7 +95,7 @@
                     "sub": [
                       {
                         "info": 9,
-                        "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }",
+                        "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }",
                         "sub": [
                           {
                             "info": 10,
@@ -120,7 +120,7 @@
                           },
                           {
                             "info": 9,
-                            "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+                            "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
                             "sub": [
                               {
                                 "info": 5,
@@ -183,7 +183,7 @@
                           },
                           {
                             "info": 9,
-                            "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+                            "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
                             "sub": [
                               {
                                 "info": 5,
@@ -223,7 +223,7 @@
                         "index": 0
                       }
                     ],
-                    "type": "({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>)"
+                    "type": "({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)"
                   },
                   {
                     "info": 6,
@@ -257,7 +257,7 @@
                   },
                   {
                     "info": 9,
-                    "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+                    "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
                     "sub": [
                       {
                         "info": 5,
@@ -324,7 +324,7 @@
           },
           {
             "info": 9,
-            "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+            "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
             "sub": [
               {
                 "info": 5,
@@ -364,15 +364,15 @@
       },
       {
         "info": 9,
-        "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\", \"cells\": \"{ \"cells_key\": \"([u8;32])\"} }<i32>\"} }",
+        "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"cells\": \"{ \"cells_key\": \"([u8;32])\" }<i32>\" }",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }",
+            "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"cell\": \"([u8;32])\"} }",
+                "type": "{ \"cell\": \"([u8;32])\" }",
                 "sub": [
                   {
                     "info": 10,
@@ -417,7 +417,7 @@
           },
           {
             "info": 9,
-            "type": "{ \"cells_key\": \"([u8;32])\"} }",
+            "type": "{ \"cells_key\": \"([u8;32])\" }",
             "sub": [
               {
                 "info": 10,
@@ -466,15 +466,15 @@
   },
   {
     "info": 9,
-    "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\"} }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>)\", \"Removed\": \"Null\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>>\"} }",
+    "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>>\" }",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }",
+        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"([u8;32])\"} }",
+            "type": "{ \"cell\": \"([u8;32])\" }",
             "sub": [
               {
                 "info": 10,
@@ -519,7 +519,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"cells_key\": \"([u8;32])\"} }",
+        "type": "{ \"cells_key\": \"([u8;32])\" }",
         "sub": [
           {
             "info": 10,
@@ -548,7 +548,7 @@
         "params": [
           {
             "info": 3,
-            "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>)\", \"Removed\": \"Null\"} }",
+            "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }",
             "sub": [
               {
                 "info": 10,
@@ -556,7 +556,7 @@
                 "sub": [
                   {
                     "info": 9,
-                    "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }",
+                    "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }",
                     "sub": [
                       {
                         "info": 10,
@@ -581,7 +581,7 @@
                       },
                       {
                         "info": 9,
-                        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+                        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
                         "sub": [
                           {
                             "info": 5,
@@ -644,7 +644,7 @@
                       },
                       {
                         "info": 9,
-                        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+                        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
                         "sub": [
                           {
                             "info": 5,
@@ -684,7 +684,7 @@
                     "index": 0
                   }
                 ],
-                "type": "({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>)"
+                "type": "({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)"
               },
               {
                 "info": 6,
@@ -718,7 +718,7 @@
               },
               {
                 "info": 9,
-                "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+                "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
                 "sub": [
                   {
                     "info": 5,
@@ -785,7 +785,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
         "sub": [
           {
             "info": 5,
@@ -862,7 +862,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+    "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
     "sub": [
       {
         "info": 5,
@@ -919,11 +919,11 @@
   },
   {
     "info": 9,
-    "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }",
+    "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"([u8;32])\"} }",
+        "type": "{ \"cell\": \"([u8;32])\" }",
         "sub": [
           {
             "info": 10,
@@ -968,7 +968,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cell\": \"([u8;32])\"} }",
+    "type": "{ \"cell\": \"([u8;32])\" }",
     "sub": [
       {
         "info": 10,
@@ -1024,7 +1024,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cells_key\": \"([u8;32])\"} }",
+    "type": "{ \"cells_key\": \"([u8;32])\" }",
     "sub": [
       {
         "info": 10,
@@ -1053,7 +1053,7 @@
     "params": [
       {
         "info": 3,
-        "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>)\", \"Removed\": \"Null\"} }",
+        "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }",
         "sub": [
           {
             "info": 10,
@@ -1061,7 +1061,7 @@
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }",
+                "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }",
                 "sub": [
                   {
                     "info": 10,
@@ -1086,7 +1086,7 @@
                   },
                   {
                     "info": 9,
-                    "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+                    "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
                     "sub": [
                       {
                         "info": 5,
@@ -1149,7 +1149,7 @@
                   },
                   {
                     "info": 9,
-                    "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+                    "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
                     "sub": [
                       {
                         "info": 5,
@@ -1189,7 +1189,7 @@
                 "index": 0
               }
             ],
-            "type": "({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>)"
+            "type": "({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)"
           },
           {
             "info": 6,
@@ -1223,7 +1223,7 @@
           },
           {
             "info": 9,
-            "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+            "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
             "sub": [
               {
                 "info": 5,
@@ -1265,7 +1265,7 @@
   },
   {
     "info": 3,
-    "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>)\", \"Removed\": \"Null\"} }",
+    "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }",
     "sub": [
       {
         "info": 10,
@@ -1273,7 +1273,7 @@
         "sub": [
           {
             "info": 9,
-            "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }",
+            "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }",
             "sub": [
               {
                 "info": 10,
@@ -1298,7 +1298,7 @@
               },
               {
                 "info": 9,
-                "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+                "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
                 "sub": [
                   {
                     "info": 5,
@@ -1361,7 +1361,7 @@
               },
               {
                 "info": 9,
-                "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+                "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
                 "sub": [
                   {
                     "info": 5,
@@ -1401,7 +1401,7 @@
             "index": 0
           }
         ],
-        "type": "({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }>)"
+        "type": "({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)"
       },
       {
         "info": 6,
@@ -1435,7 +1435,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
         "sub": [
           {
             "info": 5,
@@ -1475,7 +1475,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }\"} }",
+    "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }",
     "sub": [
       {
         "info": 10,
@@ -1500,7 +1500,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
         "sub": [
           {
             "info": 5,
@@ -1563,7 +1563,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\"} }",
+        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
         "sub": [
           {
             "info": 5,
@@ -1603,15 +1603,15 @@
   },
   {
     "info": 9,
-    "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\", \"cells\": \"{ \"cells_key\": \"([u8;32])\"} }<i32>\"} }",
+    "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"cells\": \"{ \"cells_key\": \"([u8;32])\" }<i32>\" }",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }",
+        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"([u8;32])\"} }",
+            "type": "{ \"cell\": \"([u8;32])\" }",
             "sub": [
               {
                 "info": 10,
@@ -1656,7 +1656,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"cells_key\": \"([u8;32])\"} }",
+        "type": "{ \"cells_key\": \"([u8;32])\" }",
         "sub": [
           {
             "info": 10,
@@ -1705,7 +1705,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cells_key\": \"([u8;32])\"} }",
+    "type": "{ \"cells_key\": \"([u8;32])\" }",
     "sub": [
       {
         "info": 10,
diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
index 05ad1602ce..d124edf60c 100644
--- a/packages/api-derive/package.json
+++ b/packages/api-derive/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "0.96.0-beta.27",
+  "version": "0.96.0-beta.28",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
   "keywords": [
@@ -28,8 +28,8 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme",
   "dependencies": {
     "@babel/runtime": "^7.6.3",
-    "@polkadot/api": "^0.96.0-beta.27",
-    "@polkadot/types": "^0.96.0-beta.27"
+    "@polkadot/api": "^0.96.0-beta.28",
+    "@polkadot/types": "^0.96.0-beta.28"
   },
   "devDependencies": {
     "@polkadot/keyring": "^1.7.0-beta.1"
diff --git a/packages/api-metadata/package.json b/packages/api-metadata/package.json
index 390ce37200..81980406bd 100644
--- a/packages/api-metadata/package.json
+++ b/packages/api-metadata/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-metadata",
-  "version": "0.96.0-beta.27",
+  "version": "0.96.0-beta.28",
   "description": "Helpers to extract information from runtime metadata",
   "main": "index.js",
   "publishConfig": {
@@ -27,7 +27,7 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/type-metadata#readme",
   "dependencies": {
     "@babel/runtime": "^7.6.3",
-    "@polkadot/types": "^0.96.0-beta.27",
+    "@polkadot/types": "^0.96.0-beta.28",
     "@polkadot/util": "^1.7.0-beta.1",
     "@polkadot/util-crypto": "^1.7.0-beta.1"
   },
diff --git a/packages/api/package.json b/packages/api/package.json
index 2b1374f315..284b9d5973 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api",
-  "version": "0.96.0-beta.27",
+  "version": "0.96.0-beta.28",
   "description": "Promise and RxJS wrappers around the Polkadot JS RPC",
   "main": "index.js",
   "keywords": [
@@ -27,12 +27,12 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api#readme",
   "dependencies": {
     "@babel/runtime": "^7.6.3",
-    "@polkadot/api-derive": "^0.96.0-beta.27",
-    "@polkadot/api-metadata": "^0.96.0-beta.27",
+    "@polkadot/api-derive": "^0.96.0-beta.28",
+    "@polkadot/api-metadata": "^0.96.0-beta.28",
     "@polkadot/keyring": "^1.7.0-beta.1",
-    "@polkadot/rpc-core": "^0.96.0-beta.27",
-    "@polkadot/rpc-provider": "^0.96.0-beta.27",
-    "@polkadot/types": "^0.96.0-beta.27",
+    "@polkadot/rpc-core": "^0.96.0-beta.28",
+    "@polkadot/rpc-provider": "^0.96.0-beta.28",
+    "@polkadot/types": "^0.96.0-beta.28",
     "@polkadot/util-crypto": "^1.7.0-beta.1"
   },
   "devDependencies": {
diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json
index 75a88d4b62..99fff27ea4 100644
--- a/packages/rpc-core/package.json
+++ b/packages/rpc-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-core",
-  "version": "0.96.0-beta.27",
+  "version": "0.96.0-beta.28",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
   "keywords": [
@@ -27,9 +27,9 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-core#readme",
   "dependencies": {
     "@babel/runtime": "^7.6.3",
-    "@polkadot/jsonrpc": "^0.96.0-beta.27",
-    "@polkadot/rpc-provider": "^0.96.0-beta.27",
-    "@polkadot/types": "^0.96.0-beta.27",
+    "@polkadot/jsonrpc": "^0.96.0-beta.28",
+    "@polkadot/rpc-provider": "^0.96.0-beta.28",
+    "@polkadot/types": "^0.96.0-beta.28",
     "@polkadot/util": "^1.7.0-beta.1",
     "rxjs": "^6.5.3"
   }
diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json
index eba8d022f9..3182093e39 100644
--- a/packages/rpc-provider/package.json
+++ b/packages/rpc-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-provider",
-  "version": "0.96.0-beta.27",
+  "version": "0.96.0-beta.28",
   "description": "Transport providers for the API",
   "main": "index.js",
   "keywords": [
@@ -27,7 +27,7 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-provider#readme",
   "dependencies": {
     "@babel/runtime": "^7.6.3",
-    "@polkadot/api-metadata": "^0.96.0-beta.27",
+    "@polkadot/api-metadata": "^0.96.0-beta.28",
     "@polkadot/util": "^1.7.0-beta.1",
     "@polkadot/util-crypto": "^1.7.0-beta.1",
     "@types/nock": "^11.1.0",
diff --git a/packages/type-jsonrpc/package.json b/packages/type-jsonrpc/package.json
index d40d66c918..c7e3fe8023 100644
--- a/packages/type-jsonrpc/package.json
+++ b/packages/type-jsonrpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/jsonrpc",
-  "version": "0.96.0-beta.27",
+  "version": "0.96.0-beta.28",
   "description": "Method definitions for the Polkadot RPC layer",
   "main": "index.js",
   "publishConfig": {
diff --git a/packages/types/package.json b/packages/types/package.json
index a7b6ec24e7..d9e53b513b 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types",
-  "version": "0.96.0-beta.27",
+  "version": "0.96.0-beta.28",
   "description": "Implementation of the Parity codec",
   "main": "index.js",
   "keywords": [