diff --git a/codec/data/block.bin b/codec/data/block.bin
index bfdf3aa8..35f508d4 100644
Binary files a/codec/data/block.bin and b/codec/data/block.bin differ
diff --git a/codec/data/block.json b/codec/data/block.json
index 76229aa0..2af39c13 100644
--- a/codec/data/block.json
+++ b/codec/data/block.json
@@ -35,7 +35,7 @@
                 "signature": "0x2f24ea5c5cfc5631ea3b7799222ca555250b8591751fd1d59df4abeb690d66e634aceeaf381ac13f60ee9dcd6c4645385b029b8776d7c0d8edddba0f039e3e7efca4d9c13fe75b27834585d9ac0e8f427efa5ed25d13d9f42a34c834ec1a5c2f07076e2677a80977884012425bfe958b306e2deb61b677bd4e4952df117fab2a3d2bdf4be8e7bae62f1415dd86adeb8bfa5bcf7a329ed19cb770750c1ee3901502ac3d44882f3cb85c78dd1164cdf48f9742ed80dc644c4a6117e95b90b4403f2cbcb44856c7aeae36aa64ee19c671350a1fffa4c0eead5863430c72d9681d80a66a95e083051eabe71518efb861c9a2316d949b177b8d415855625996c2322183506053ed443a24107e8826f2f30f1d0196df96edf78718a587f89e5aa52ca187a7e04ed51433fb030af5633510042de1e904ec2478743c58d3535151b430452e82e77608d6ee7f56a1a1446b4fa6d89aa979a90422233a05b82564695ff4b6361d920a22c441c6f0505fa260a71b7e1f278711f27ebd9c00b4885a671021d0d75bc9a9c95ceb73cadb1c301f1da2111a86a5f87a8a7d5153ebbc98bf3a83ef65e5d7aedec99927bc5138dacbc75e8391f91537417ee7f8d72869df185a333d081423f4222c114a04727e0de4169b0e32f3b85b9cdab701208a2b39c7fb0892e09b01186f76ea73bd927fcef68886433ca15f4c968581d50fabed92a7dd7f005fb99c5d5fafbacd763c2c401dbbd3e89eee769ff41ed06b771675070242405e5ac7bae5f547b7e64ee82aca2e32977453da4c5651038e51420c33dfeb24f8a6ea1271de70e1dc8100dbf0df3d71cb30915cb8937cc31caa7cfc0ed5bca03de30ab2e67e55feffcc0c8db7e98414ef85896b9b881958527a9f2d0cc68b02795f4131c3812b1393ce9f6f0617d1aec9a3cd51be4bddb7a75cc8bc710197e618407fe4a1b8908dac4b8031d22e8f7591304c8641daf97abcbc55e81de7b935b94ef074fcb19808e7c3fa0ce827f70a3feb301da33af34fb9a4ad21acc7dcabcabe06f9fba188eeb9e30badc43fda3030fb8f888a41a8822c7fa32ff8fe0dd2abfc7d6323ebcdd0092d5f82c5d94e6ea296"
             },
             {
-                "attempt": 0,
+                "attempt": 2,
                 "signature": "0x036479afe8e29f97741a1e3c2b59c217dc67d8a25f7ce12bf1febf6b4a5b2646fd81cdf0a75e20fc0de981f48471527728b0c4d151fbdd9b32e6c6b3c6cd71db9b51d1cca8eef4a128d63f542bdb129c6edca628e1276d8376347bd2071d949b7ec5d1bfc18ebc61753a5f24544d1ae75b6f6f35a5707fc99e787b86cb5a17138069f5bac8d16e08b20781b8841ff928a49ec7bf09f5f39159cb44370a5ce16b93b2d4325445bfd641f2ef750e1971690a4f11e815d418a4dca01f8d039f4543a59665dcea27a24dbb1fddca0a2e90b4e3292dfc7a5cee69c1e707cd491742f3d3015d9499b07bbf6ddc2342e48522c149089311cf6ccc9bf957b509e52df550f06e70f4f601c01c1326e0ce7e7ce2547fcc16509b8bdb1577b15adb042f1e393c01bc010ba3460119ab738e58e39297278315b0825b8b798835a7a0b133a0d890a24018f0797c3ba43d62dcda03320215c5734bc1b10e8bef5003aefb5513ce9cd1964db23b1a143c4da8142676e254f00f84cfc15fa1a3bab78536f5f9e2cbce7560be876142a8655b8c1fdf0ffab7e187ace3c37ed2c6dfc4590e658ad2efc8cdec6140452493e2693e682946d1c99a62cca529f46a6e9874ef72955e4d855881e35ef53fd95e307f9ebf94542860711bdd288ab13d8dec1fecd82fc9a2eb97e67ae38ec859034473972157b819b3215e359bf17952b95aaa2932f09e2a8c8e0fea82de9c6c2612766ed50702667520fbd5089c0cc300e9d32893799cf73520f5a925bdfb791a419e80e118d2ba69031566da30c06f5e83e74f4eae8a886018a4c1269a97217851bcb4bb945dbf1309d1d2e59d78474f5e52702536761eed0d9fd01e46261b61dca3fc85a0b4bdfa315edb0972fed80399909eef35ed10cda0e1a66680eedcf15b400d404dadf77cda5641412c20a465cea4411820ee491678821eef8dca745a2ffd8a787837d22b486342499ad84a51d4093655947185bfe72018c16b8fe622ab58c7d965e8dac3b1d5c9cedfb27f562d077ab85e1293496d69f6bafd8468855b50255788b430ed6e6ef8c0fde28651b005a91dbb0fd4d0635108d5ff9e4527fefa66817221b76f"
             }
         ],
@@ -80,7 +80,7 @@
                             "service_id": 16909060,
                             "code_hash": "0x70a50829851e8f6a8c80f92806ae0e95eb7c06ad064e311cc39107b3219e532e",
                             "payload_hash": "0xfa99b97e72fcfaef616108de981a59dc3310e2a9f5e73cd44d702ecaaccd8696",
-                            "gas": 42,
+                            "accumulate_gas": 42,
                             "result": {
                                 "ok": "0xaabbcc"
                             }
@@ -89,7 +89,7 @@
                             "service_id": 84281096,
                             "code_hash": "0xfcfc857dab216daf41f409c2012685846e4d34aedfeacaf84d9adfebda73fae6",
                             "payload_hash": "0xd55e07438aeeeb0d6509ab28af8a758d1fb70424db6b27c7e1ef6473e721c328",
-                            "gas": 33,
+                            "accumulate_gas": 33,
                             "result": {
                                 "panic": null
                             }
diff --git a/codec/data/extrinsic.bin b/codec/data/extrinsic.bin
index 4bc9896a..8b974622 100644
Binary files a/codec/data/extrinsic.bin and b/codec/data/extrinsic.bin differ
diff --git a/codec/data/extrinsic.json b/codec/data/extrinsic.json
index 3afd1ccc..e00c02a2 100644
--- a/codec/data/extrinsic.json
+++ b/codec/data/extrinsic.json
@@ -9,7 +9,7 @@
             "signature": "0x2f24ea5c5cfc5631ea3b7799222ca555250b8591751fd1d59df4abeb690d66e634aceeaf381ac13f60ee9dcd6c4645385b029b8776d7c0d8edddba0f039e3e7efca4d9c13fe75b27834585d9ac0e8f427efa5ed25d13d9f42a34c834ec1a5c2f07076e2677a80977884012425bfe958b306e2deb61b677bd4e4952df117fab2a3d2bdf4be8e7bae62f1415dd86adeb8bfa5bcf7a329ed19cb770750c1ee3901502ac3d44882f3cb85c78dd1164cdf48f9742ed80dc644c4a6117e95b90b4403f2cbcb44856c7aeae36aa64ee19c671350a1fffa4c0eead5863430c72d9681d80a66a95e083051eabe71518efb861c9a2316d949b177b8d415855625996c2322183506053ed443a24107e8826f2f30f1d0196df96edf78718a587f89e5aa52ca187a7e04ed51433fb030af5633510042de1e904ec2478743c58d3535151b430452e82e77608d6ee7f56a1a1446b4fa6d89aa979a90422233a05b82564695ff4b6361d920a22c441c6f0505fa260a71b7e1f278711f27ebd9c00b4885a671021d0d75bc9a9c95ceb73cadb1c301f1da2111a86a5f87a8a7d5153ebbc98bf3a83ef65e5d7aedec99927bc5138dacbc75e8391f91537417ee7f8d72869df185a333d081423f4222c114a04727e0de4169b0e32f3b85b9cdab701208a2b39c7fb0892e09b01186f76ea73bd927fcef68886433ca15f4c968581d50fabed92a7dd7f005fb99c5d5fafbacd763c2c401dbbd3e89eee769ff41ed06b771675070242405e5ac7bae5f547b7e64ee82aca2e32977453da4c5651038e51420c33dfeb24f8a6ea1271de70e1dc8100dbf0df3d71cb30915cb8937cc31caa7cfc0ed5bca03de30ab2e67e55feffcc0c8db7e98414ef85896b9b881958527a9f2d0cc68b02795f4131c3812b1393ce9f6f0617d1aec9a3cd51be4bddb7a75cc8bc710197e618407fe4a1b8908dac4b8031d22e8f7591304c8641daf97abcbc55e81de7b935b94ef074fcb19808e7c3fa0ce827f70a3feb301da33af34fb9a4ad21acc7dcabcabe06f9fba188eeb9e30badc43fda3030fb8f888a41a8822c7fa32ff8fe0dd2abfc7d6323ebcdd0092d5f82c5d94e6ea296"
         },
         {
-            "attempt": 0,
+            "attempt": 2,
             "signature": "0x036479afe8e29f97741a1e3c2b59c217dc67d8a25f7ce12bf1febf6b4a5b2646fd81cdf0a75e20fc0de981f48471527728b0c4d151fbdd9b32e6c6b3c6cd71db9b51d1cca8eef4a128d63f542bdb129c6edca628e1276d8376347bd2071d949b7ec5d1bfc18ebc61753a5f24544d1ae75b6f6f35a5707fc99e787b86cb5a17138069f5bac8d16e08b20781b8841ff928a49ec7bf09f5f39159cb44370a5ce16b93b2d4325445bfd641f2ef750e1971690a4f11e815d418a4dca01f8d039f4543a59665dcea27a24dbb1fddca0a2e90b4e3292dfc7a5cee69c1e707cd491742f3d3015d9499b07bbf6ddc2342e48522c149089311cf6ccc9bf957b509e52df550f06e70f4f601c01c1326e0ce7e7ce2547fcc16509b8bdb1577b15adb042f1e393c01bc010ba3460119ab738e58e39297278315b0825b8b798835a7a0b133a0d890a24018f0797c3ba43d62dcda03320215c5734bc1b10e8bef5003aefb5513ce9cd1964db23b1a143c4da8142676e254f00f84cfc15fa1a3bab78536f5f9e2cbce7560be876142a8655b8c1fdf0ffab7e187ace3c37ed2c6dfc4590e658ad2efc8cdec6140452493e2693e682946d1c99a62cca529f46a6e9874ef72955e4d855881e35ef53fd95e307f9ebf94542860711bdd288ab13d8dec1fecd82fc9a2eb97e67ae38ec859034473972157b819b3215e359bf17952b95aaa2932f09e2a8c8e0fea82de9c6c2612766ed50702667520fbd5089c0cc300e9d32893799cf73520f5a925bdfb791a419e80e118d2ba69031566da30c06f5e83e74f4eae8a886018a4c1269a97217851bcb4bb945dbf1309d1d2e59d78474f5e52702536761eed0d9fd01e46261b61dca3fc85a0b4bdfa315edb0972fed80399909eef35ed10cda0e1a66680eedcf15b400d404dadf77cda5641412c20a465cea4411820ee491678821eef8dca745a2ffd8a787837d22b486342499ad84a51d4093655947185bfe72018c16b8fe622ab58c7d965e8dac3b1d5c9cedfb27f562d077ab85e1293496d69f6bafd8468855b50255788b430ed6e6ef8c0fde28651b005a91dbb0fd4d0635108d5ff9e4527fefa66817221b76f"
         }
     ],
@@ -54,7 +54,7 @@
                         "service_id": 16909060,
                         "code_hash": "0x70a50829851e8f6a8c80f92806ae0e95eb7c06ad064e311cc39107b3219e532e",
                         "payload_hash": "0xfa99b97e72fcfaef616108de981a59dc3310e2a9f5e73cd44d702ecaaccd8696",
-                        "gas": 42,
+                        "accumulate_gas": 42,
                         "result": {
                             "ok": "0xaabbcc"
                         }
@@ -63,7 +63,7 @@
                         "service_id": 84281096,
                         "code_hash": "0xfcfc857dab216daf41f409c2012685846e4d34aedfeacaf84d9adfebda73fae6",
                         "payload_hash": "0xd55e07438aeeeb0d6509ab28af8a758d1fb70424db6b27c7e1ef6473e721c328",
-                        "gas": 33,
+                        "accumulate_gas": 33,
                         "result": {
                             "panic": null
                         }
diff --git a/codec/data/guarantees_extrinsic.json b/codec/data/guarantees_extrinsic.json
index 204f9c48..e5999848 100644
--- a/codec/data/guarantees_extrinsic.json
+++ b/codec/data/guarantees_extrinsic.json
@@ -25,7 +25,7 @@
                     "service_id": 16909060,
                     "code_hash": "0x70a50829851e8f6a8c80f92806ae0e95eb7c06ad064e311cc39107b3219e532e",
                     "payload_hash": "0xfa99b97e72fcfaef616108de981a59dc3310e2a9f5e73cd44d702ecaaccd8696",
-                    "gas": 42,
+                    "accumulate_gas": 42,
                     "result": {
                         "ok": "0xaabbcc"
                     }
@@ -34,7 +34,7 @@
                     "service_id": 84281096,
                     "code_hash": "0xfcfc857dab216daf41f409c2012685846e4d34aedfeacaf84d9adfebda73fae6",
                     "payload_hash": "0xd55e07438aeeeb0d6509ab28af8a758d1fb70424db6b27c7e1ef6473e721c328",
-                    "gas": 33,
+                    "accumulate_gas": 33,
                     "result": {
                         "panic": null
                     }
diff --git a/codec/data/header_1.bin b/codec/data/header_1.bin
index afafe256..e388b3a6 100644
Binary files a/codec/data/header_1.bin and b/codec/data/header_1.bin differ
diff --git a/codec/data/header_1.json b/codec/data/header_1.json
index 47ba05d1..6d261728 100644
--- a/codec/data/header_1.json
+++ b/codec/data/header_1.json
@@ -15,19 +15,19 @@
         },
         {
             "id": "0x036479afe8e29f97741a1e3c2b59c217dc67d8a25f7ce12bf1febf6b4a5b2646",
-            "attempt": 0
+            "attempt": 2
         },
         {
             "id": "0xa8a439a4aa6e18682c6a524feb2da2ebcead6f0fb0826707aef7b1d57e790e6e",
-            "attempt": 1
+            "attempt": 0
         },
         {
             "id": "0x4fc10511323e4b3b82cf10ece1a1f6b8497dbdd9de032e6c6986d57303c31364",
-            "attempt": 0
+            "attempt": 1
         },
         {
             "id": "0xd5ca7a57adaffc68011b46ec02ff8baad3f1539068f642b6af2cfcaca639d96e",
-            "attempt": 1
+            "attempt": 2
         },
         {
             "id": "0x3ec31eb46e471951d21febf6a2842b8482b2ea40a61b37c4cbd4f136ef31d24f",
@@ -39,19 +39,19 @@
         },
         {
             "id": "0x3559f53a0ad2e4462b2d1805ac28a665e2181fdc27e5acc6561fd6e713e7d498",
-            "attempt": 0
+            "attempt": 2
         },
         {
             "id": "0x5ed4423732dbeb794c7a05fc899718a093ad9c832a1d3a89f34f525e55b87f53",
-            "attempt": 1
+            "attempt": 0
         },
         {
             "id": "0xfdee093e7fd5cace92b7eb9f41d3ee7154aabcf84b797a6eb2e951ae11ed921c",
-            "attempt": 0
+            "attempt": 1
         },
         {
             "id": "0xabf4869d2585e777feb713a7fd79ea49dbea2ca3eeb5e081c63ece4d6208c68c",
-            "attempt": 1
+            "attempt": 2
         }
     ],
     "offenders_mark": [],
diff --git a/codec/data/tickets_extrinsic.bin b/codec/data/tickets_extrinsic.bin
index 1b11f277..b4e1e572 100644
Binary files a/codec/data/tickets_extrinsic.bin and b/codec/data/tickets_extrinsic.bin differ
diff --git a/codec/data/tickets_extrinsic.json b/codec/data/tickets_extrinsic.json
index 5168587b..93c64d3f 100644
--- a/codec/data/tickets_extrinsic.json
+++ b/codec/data/tickets_extrinsic.json
@@ -8,7 +8,7 @@
         "signature": "0x2f24ea5c5cfc5631ea3b7799222ca555250b8591751fd1d59df4abeb690d66e634aceeaf381ac13f60ee9dcd6c4645385b029b8776d7c0d8edddba0f039e3e7efca4d9c13fe75b27834585d9ac0e8f427efa5ed25d13d9f42a34c834ec1a5c2f07076e2677a80977884012425bfe958b306e2deb61b677bd4e4952df117fab2a3d2bdf4be8e7bae62f1415dd86adeb8bfa5bcf7a329ed19cb770750c1ee3901502ac3d44882f3cb85c78dd1164cdf48f9742ed80dc644c4a6117e95b90b4403f2cbcb44856c7aeae36aa64ee19c671350a1fffa4c0eead5863430c72d9681d80a66a95e083051eabe71518efb861c9a2316d949b177b8d415855625996c2322183506053ed443a24107e8826f2f30f1d0196df96edf78718a587f89e5aa52ca187a7e04ed51433fb030af5633510042de1e904ec2478743c58d3535151b430452e82e77608d6ee7f56a1a1446b4fa6d89aa979a90422233a05b82564695ff4b6361d920a22c441c6f0505fa260a71b7e1f278711f27ebd9c00b4885a671021d0d75bc9a9c95ceb73cadb1c301f1da2111a86a5f87a8a7d5153ebbc98bf3a83ef65e5d7aedec99927bc5138dacbc75e8391f91537417ee7f8d72869df185a333d081423f4222c114a04727e0de4169b0e32f3b85b9cdab701208a2b39c7fb0892e09b01186f76ea73bd927fcef68886433ca15f4c968581d50fabed92a7dd7f005fb99c5d5fafbacd763c2c401dbbd3e89eee769ff41ed06b771675070242405e5ac7bae5f547b7e64ee82aca2e32977453da4c5651038e51420c33dfeb24f8a6ea1271de70e1dc8100dbf0df3d71cb30915cb8937cc31caa7cfc0ed5bca03de30ab2e67e55feffcc0c8db7e98414ef85896b9b881958527a9f2d0cc68b02795f4131c3812b1393ce9f6f0617d1aec9a3cd51be4bddb7a75cc8bc710197e618407fe4a1b8908dac4b8031d22e8f7591304c8641daf97abcbc55e81de7b935b94ef074fcb19808e7c3fa0ce827f70a3feb301da33af34fb9a4ad21acc7dcabcabe06f9fba188eeb9e30badc43fda3030fb8f888a41a8822c7fa32ff8fe0dd2abfc7d6323ebcdd0092d5f82c5d94e6ea296"
     },
     {
-        "attempt": 0,
+        "attempt": 2,
         "signature": "0x036479afe8e29f97741a1e3c2b59c217dc67d8a25f7ce12bf1febf6b4a5b2646fd81cdf0a75e20fc0de981f48471527728b0c4d151fbdd9b32e6c6b3c6cd71db9b51d1cca8eef4a128d63f542bdb129c6edca628e1276d8376347bd2071d949b7ec5d1bfc18ebc61753a5f24544d1ae75b6f6f35a5707fc99e787b86cb5a17138069f5bac8d16e08b20781b8841ff928a49ec7bf09f5f39159cb44370a5ce16b93b2d4325445bfd641f2ef750e1971690a4f11e815d418a4dca01f8d039f4543a59665dcea27a24dbb1fddca0a2e90b4e3292dfc7a5cee69c1e707cd491742f3d3015d9499b07bbf6ddc2342e48522c149089311cf6ccc9bf957b509e52df550f06e70f4f601c01c1326e0ce7e7ce2547fcc16509b8bdb1577b15adb042f1e393c01bc010ba3460119ab738e58e39297278315b0825b8b798835a7a0b133a0d890a24018f0797c3ba43d62dcda03320215c5734bc1b10e8bef5003aefb5513ce9cd1964db23b1a143c4da8142676e254f00f84cfc15fa1a3bab78536f5f9e2cbce7560be876142a8655b8c1fdf0ffab7e187ace3c37ed2c6dfc4590e658ad2efc8cdec6140452493e2693e682946d1c99a62cca529f46a6e9874ef72955e4d855881e35ef53fd95e307f9ebf94542860711bdd288ab13d8dec1fecd82fc9a2eb97e67ae38ec859034473972157b819b3215e359bf17952b95aaa2932f09e2a8c8e0fea82de9c6c2612766ed50702667520fbd5089c0cc300e9d32893799cf73520f5a925bdfb791a419e80e118d2ba69031566da30c06f5e83e74f4eae8a886018a4c1269a97217851bcb4bb945dbf1309d1d2e59d78474f5e52702536761eed0d9fd01e46261b61dca3fc85a0b4bdfa315edb0972fed80399909eef35ed10cda0e1a66680eedcf15b400d404dadf77cda5641412c20a465cea4411820ee491678821eef8dca745a2ffd8a787837d22b486342499ad84a51d4093655947185bfe72018c16b8fe622ab58c7d965e8dac3b1d5c9cedfb27f562d077ab85e1293496d69f6bafd8468855b50255788b430ed6e6ef8c0fde28651b005a91dbb0fd4d0635108d5ff9e4527fefa66817221b76f"
     }
 ]
diff --git a/codec/data/work_item.bin b/codec/data/work_item.bin
index 80ce5490..8c8b57ad 100644
Binary files a/codec/data/work_item.bin and b/codec/data/work_item.bin differ
diff --git a/codec/data/work_item.json b/codec/data/work_item.json
index 3fa8c68f..9de37b3c 100644
--- a/codec/data/work_item.json
+++ b/codec/data/work_item.json
@@ -2,7 +2,8 @@
     "service": 16909060,
     "code_hash": "0x70a50829851e8f6a8c80f92806ae0e95eb7c06ad064e311cc39107b3219e532e",
     "payload": "0x0102030405",
-    "gas_limit": 42,
+    "refine_gas_limit": 42,
+    "accumulate_gas_limit": 42,
     "import_segments": [
         {
             "tree_root": "0x461236a7eb29dcffc1dd282ce1de0e0ed691fc80e91e02276fe8f778f088a1b8",
diff --git a/codec/data/work_package.bin b/codec/data/work_package.bin
index de2d5c67..f37b15a9 100644
Binary files a/codec/data/work_package.bin and b/codec/data/work_package.bin differ
diff --git a/codec/data/work_package.json b/codec/data/work_package.json
index d455a943..303f40bc 100644
--- a/codec/data/work_package.json
+++ b/codec/data/work_package.json
@@ -18,7 +18,8 @@
             "service": 16909060,
             "code_hash": "0x70a50829851e8f6a8c80f92806ae0e95eb7c06ad064e311cc39107b3219e532e",
             "payload": "0x0102030405",
-            "gas_limit": 42,
+            "refine_gas_limit": 42,
+            "accumulate_gas_limit": 42,
             "import_segments": [
                 {
                     "tree_root": "0x461236a7eb29dcffc1dd282ce1de0e0ed691fc80e91e02276fe8f778f088a1b8",
@@ -49,7 +50,8 @@
             "service": 84281096,
             "code_hash": "0xfcfc857dab216daf41f409c2012685846e4d34aedfeacaf84d9adfebda73fae6",
             "payload": "0x030201",
-            "gas_limit": 77,
+            "refine_gas_limit": 77,
+            "accumulate_gas_limit": 77,
             "import_segments": [
                 {
                     "tree_root": "0x3e5d0bea78537414bd1cfdaeb0f22d743bcaba5dbffacbabce8457f4cd78f69b",
diff --git a/codec/data/work_report.json b/codec/data/work_report.json
index 4fba815d..a2bc156c 100644
--- a/codec/data/work_report.json
+++ b/codec/data/work_report.json
@@ -23,7 +23,7 @@
             "service_id": 16909060,
             "code_hash": "0x70a50829851e8f6a8c80f92806ae0e95eb7c06ad064e311cc39107b3219e532e",
             "payload_hash": "0xfa99b97e72fcfaef616108de981a59dc3310e2a9f5e73cd44d702ecaaccd8696",
-            "gas": 42,
+            "accumulate_gas": 42,
             "result": {
                 "ok": "0xaabbcc"
             }
@@ -32,7 +32,7 @@
             "service_id": 84281096,
             "code_hash": "0xfcfc857dab216daf41f409c2012685846e4d34aedfeacaf84d9adfebda73fae6",
             "payload_hash": "0xd55e07438aeeeb0d6509ab28af8a758d1fb70424db6b27c7e1ef6473e721c328",
-            "gas": 33,
+            "accumulate_gas": 33,
             "result": {
                 "panic": null
             }
diff --git a/codec/data/work_result_0.json b/codec/data/work_result_0.json
index fa3fa4de..7c39c243 100644
--- a/codec/data/work_result_0.json
+++ b/codec/data/work_result_0.json
@@ -2,7 +2,7 @@
     "service_id": 16909060,
     "code_hash": "0x70a50829851e8f6a8c80f92806ae0e95eb7c06ad064e311cc39107b3219e532e",
     "payload_hash": "0xfa99b97e72fcfaef616108de981a59dc3310e2a9f5e73cd44d702ecaaccd8696",
-    "gas": 42,
+    "accumulate_gas": 42,
     "result": {
         "ok": "0xaabbcc"
     }
diff --git a/codec/data/work_result_1.json b/codec/data/work_result_1.json
index 20798b99..83c0e151 100644
--- a/codec/data/work_result_1.json
+++ b/codec/data/work_result_1.json
@@ -2,7 +2,7 @@
     "service_id": 84281096,
     "code_hash": "0xfcfc857dab216daf41f409c2012685846e4d34aedfeacaf84d9adfebda73fae6",
     "payload_hash": "0xd55e07438aeeeb0d6509ab28af8a758d1fb70424db6b27c7e1ef6473e721c328",
-    "gas": 33,
+    "accumulate_gas": 33,
     "result": {
         "panic": null
     }
diff --git a/jam-types-asn/jam-types.asn b/jam-types-asn/jam-types.asn
index 133df130..b4caa9b9 100644
--- a/jam-types-asn/jam-types.asn
+++ b/jam-types-asn/jam-types.asn
@@ -136,7 +136,8 @@ WorkItem ::= SEQUENCE {
     service ServiceId,
     code-hash OpaqueHash,
     payload ByteSequence,
-    gas-limit Gas,
+    refine-gas-limit Gas,
+    accumulate-gas-limit Gas,
     import-segments SEQUENCE OF ImportSpec,
     extrinsic SEQUENCE OF ExtrinsicSpec,
     export-count U16
@@ -166,7 +167,7 @@ WorkResult ::= SEQUENCE {
     service-id ServiceId,
     code-hash OpaqueHash,
     payload-hash OpaqueHash,
-    gas Gas,
+    accumulate-gas Gas,
     result WorkExecResult
 }