diff --git a/dataformat-generator/build.rs b/dataformat-generator/build.rs
index cc3d48fecc..93aa47d717 100644
--- a/dataformat-generator/build.rs
+++ b/dataformat-generator/build.rs
@@ -26,8 +26,11 @@ use starcoin_types::transaction::{
     Module, Package, Script, SignedUserTransaction, Transaction, TransactionArgument,
     TransactionPayload,
 };
-use starcoin_types::write_set::{WriteOp, WriteSet};
-use starcoin_vm_types::state_store::state_key::StateKey;
+use starcoin_types::write_set::{self, WriteOp, WriteSet};
+use starcoin_vm_types::state_store::{
+    state_key::StateKey,
+    state_value::{PersistedStateValueMetadata, StateValueMetadata},
+};
 
 fn main() {
     generate().unwrap();
@@ -52,7 +55,8 @@ fn generate() -> Result<(), Error> {
         let pri_key = Ed25519PrivateKey::generate_for_testing();
         tracer.trace_value(&mut samples, &pri_key)?;
         tracer.trace_value(&mut samples, &pri_key.public_key())?;
-        tracer.trace_value(&mut samples, &pri_key.sign(&DummyObj::default())?)?;
+        let signature = pri_key.sign(&DummyObj::default()).unwrap();
+        tracer.trace_value(&mut samples, &signature)?;
 
         tracer.trace_value::<AuthenticationKey>(
             &mut samples,
@@ -63,7 +67,8 @@ fn generate() -> Result<(), Error> {
         let pri_key = MultiEd25519PrivateKey::generate_for_testing();
         tracer.trace_value(&mut samples, &pri_key)?;
         tracer.trace_value(&mut samples, &pri_key.public_key())?;
-        tracer.trace_value(&mut samples, &pri_key.sign(&DummyObj::default())?)?;
+        let signature = pri_key.sign(&DummyObj::default()).unwrap();
+        tracer.trace_value(&mut samples, &signature)?;
     }
 
     tracer.trace_type::<BlockMetadata>(&samples)?;
@@ -75,12 +80,19 @@ fn generate() -> Result<(), Error> {
     tracer.trace_type::<ContractEventV0>(&samples)?;
     tracer.trace_type::<ContractEvent>(&samples)?;
     tracer.trace_type::<StateKey>(&samples)?;
+    tracer.trace_type::<PersistedStateValueMetadata>(&samples)?;
     tracer.trace_type::<WriteSet>(&samples)?;
 
     tracer.trace_type::<TransactionArgument>(&samples)?;
     tracer.trace_type::<TransactionAuthenticator>(&samples)?;
     tracer.trace_type::<TransactionPayload>(&samples)?;
     tracer.trace_type::<TypeTag>(&samples)?;
+    tracer.trace_value(
+        &mut samples,
+        &write_set::WriteOp::Deletion {
+            metadata: StateValueMetadata::none(),
+        },
+    )?;
     tracer.trace_type::<WriteOp>(&samples)?;
     tracer.trace_type::<Script>(&samples)?;
     tracer.trace_type::<Module>(&samples)?;
@@ -100,10 +112,11 @@ fn generate() -> Result<(), Error> {
     tracer.trace_type::<SigningMessage>(&samples)?;
     tracer.trace_type::<SignedMessage>(&samples)?;
     tracer.ignore_aliases("StructTag", &["type_params"])?;
+    println!("YSG after");
     let registry = tracer.registry()?;
+    println!("YSG before");
     let data = serde_yaml::to_string(&registry).unwrap();
     std::fs::write("../etc/starcoin_types.yml", data).unwrap();
-
     {
         let mut tracer = Tracer::new(TracerConfig::default());
         let samples = Samples::new();
@@ -120,6 +133,7 @@ fn generate() -> Result<(), Error> {
         let data = serde_yaml::to_string(&registry).unwrap();
         std::fs::write("../etc/onchain_events.yml", data).unwrap();
     }
+
     // println!("{}", data);
     Ok(())
 }
diff --git a/etc/starcoin_types.yml b/etc/starcoin_types.yml
index 34cfe67cd0..11fa56f2ed 100644
--- a/etc/starcoin_types.yml
+++ b/etc/starcoin_types.yml
@@ -78,18 +78,35 @@ DataPath:
       Resource:
         NEWTYPE:
           TYPENAME: StructTag
+    2:
+      ResourceGroup:
+        NEWTYPE:
+          TYPENAME: StructTag
 DataType:
   ENUM:
     0:
       CODE: UNIT
     1:
       RESOURCE: UNIT
+    2:
+      ResourceGroup: UNIT
 Ed25519PrivateKey:
   NEWTYPESTRUCT: BYTES
 Ed25519PublicKey:
   NEWTYPESTRUCT: BYTES
 Ed25519Signature:
   NEWTYPESTRUCT: BYTES
+EntryFunction:
+  STRUCT:
+    - module:
+        TYPENAME: ModuleId
+    - function:
+        TYPENAME: Identifier
+    - ty_args:
+        SEQ:
+          TYPENAME: TypeTag
+    - args:
+        SEQ: BYTES
 EventHandle:
   STRUCT:
     - count: U64
@@ -98,7 +115,11 @@ EventHandle:
 EventKey:
   NEWTYPESTRUCT: BYTES
 HashValue:
-  NEWTYPESTRUCT: BYTES
+  STRUCT:
+    - hash:
+        TUPLEARRAY:
+          CONTENT: U8
+          SIZE: 32
 Identifier:
   NEWTYPESTRUCT: STR
 KeyRotationCapabilityResource:
@@ -129,7 +150,7 @@ Package:
           TYPENAME: Module
     - init_script:
         OPTION:
-          TYPENAME: ScriptFunction
+          TYPENAME: EntryFunction
 RawUserTransaction:
   STRUCT:
     - sender:
@@ -161,17 +182,6 @@ ScriptABI:
       ScriptFunction:
         NEWTYPE:
           TYPENAME: ScriptFunctionABI
-ScriptFunction:
-  STRUCT:
-    - module:
-        TYPENAME: ModuleId
-    - function:
-        TYPENAME: Identifier
-    - ty_args:
-        SEQ:
-          TYPENAME: TypeTag
-    - args:
-        SEQ: BYTES
 ScriptFunctionABI:
   STRUCT:
     - name: STR
@@ -211,8 +221,26 @@ StateKey:
           TYPENAME: AccessPath
     1:
       TableItem:
-        NEWTYPE:
-          TYPENAME: TableItem
+        STRUCT:
+          - handle:
+              TYPENAME: TableHandle
+          - key: BYTES
+    2:
+      Raw:
+        NEWTYPE: BYTES
+StateValueMetadata:
+  ENUM:
+    0:
+      V0:
+        STRUCT:
+          - deposit: U64
+          - creation_time_usecs: U64
+    1:
+      V1:
+        STRUCT:
+          - slot_deposit: U64
+          - bytes_deposit: U64
+          - creation_time_usecs: U64
 StructTag:
   STRUCT:
     - address:
@@ -227,11 +255,6 @@ StructTag:
 TableHandle:
   NEWTYPESTRUCT:
     TYPENAME: AccountAddress
-TableItem:
-  STRUCT:
-    - handle:
-        TYPENAME: TableHandle
-    - key: BYTES
 Transaction:
   ENUM:
     0:
@@ -302,9 +325,9 @@ TransactionPayload:
         NEWTYPE:
           TYPENAME: Package
     2:
-      ScriptFunction:
+      EntryFunction:
         NEWTYPE:
-          TYPENAME: ScriptFunction
+          TYPENAME: EntryFunction
 TransactionScriptABI:
   STRUCT:
     - name: STR
@@ -354,17 +377,44 @@ WithdrawCapabilityResource:
 WriteOp:
   ENUM:
     0:
-      Deletion: UNIT
+      Creation:
+        NEWTYPE: BYTES
     1:
-      Value:
+      Modification:
         NEWTYPE: BYTES
+    2:
+      Deletion: UNIT
+    3:
+      CreationWithMetadata:
+        STRUCT:
+          - data: BYTES
+          - metadata:
+              TYPENAME: StateValueMetadata
+    4:
+      ModificationWithMetadata:
+        STRUCT:
+          - data: BYTES
+          - metadata:
+              TYPENAME: StateValueMetadata
+    5:
+      DeletionWithMetadata:
+        STRUCT:
+          - metadata:
+              TYPENAME: StateValueMetadata
 WriteSet:
-  NEWTYPESTRUCT:
-    TYPENAME: WriteSetMut
+  ENUM:
+    0:
+      V0:
+        NEWTYPE:
+          TYPENAME: WriteSetV0
 WriteSetMut:
   STRUCT:
     - write_set:
-        SEQ:
-          TUPLE:
-            - TYPENAME: StateKey
-            - TYPENAME: WriteOp
+        MAP:
+          KEY:
+            TYPENAME: StateKey
+          VALUE:
+            TYPENAME: WriteOp
+WriteSetV0:
+  NEWTYPESTRUCT:
+    TYPENAME: WriteSetMut