diff --git a/examples/spawn-and-move/manifests/dev/abis/base/dojo_world_world.json b/examples/spawn-and-move/manifests/dev/abis/base/dojo_world_world.json
index ddc4fcb4c4..af39462af3 100644
--- a/examples/spawn-and-move/manifests/dev/abis/base/dojo_world_world.json
+++ b/examples/spawn-and-move/manifests/dev/abis/base/dojo_world_world.json
@@ -38,6 +38,58 @@
       }
     ]
   },
+  {
+    "type": "enum",
+    "name": "dojo::model::FieldLayout",
+    "variants": [
+      {
+        "name": "Fixed",
+        "type": "core::array::Span::<core::integer::u8>"
+      },
+      {
+        "name": "Dynamic",
+        "type": "()"
+      }
+    ]
+  },
+  {
+    "type": "struct",
+    "name": "dojo::model::FieldData",
+    "members": [
+      {
+        "name": "selector",
+        "type": "core::felt252"
+      },
+      {
+        "name": "field_layout",
+        "type": "dojo::model::FieldLayout"
+      }
+    ]
+  },
+  {
+    "type": "struct",
+    "name": "core::array::Span::<dojo::model::FieldData>",
+    "members": [
+      {
+        "name": "snapshot",
+        "type": "@core::array::Array::<dojo::model::FieldData>"
+      }
+    ]
+  },
+  {
+    "type": "enum",
+    "name": "dojo::model::ModelLayout",
+    "variants": [
+      {
+        "name": "Serial",
+        "type": "core::array::Span::<core::integer::u8>"
+      },
+      {
+        "name": "Hash",
+        "type": "core::array::Span::<dojo::model::FieldData>"
+      }
+    ]
+  },
   {
     "type": "enum",
     "name": "core::bool",
@@ -193,7 +245,7 @@
           },
           {
             "name": "layout",
-            "type": "core::array::Span::<core::integer::u8>"
+            "type": "dojo::model::ModelLayout"
           }
         ],
         "outputs": [
@@ -221,7 +273,7 @@
           },
           {
             "name": "layout",
-            "type": "core::array::Span::<core::integer::u8>"
+            "type": "dojo::model::ModelLayout"
           }
         ],
         "outputs": [],
@@ -252,7 +304,7 @@
           },
           {
             "name": "layout",
-            "type": "core::array::Span::<core::integer::u8>"
+            "type": "dojo::model::ModelLayout"
           }
         ],
         "outputs": [],
diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_actions_actions_moved.json b/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_actions_actions_moved.json
deleted file mode 100644
index 55206aa098..0000000000
--- a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_actions_actions_moved.json
+++ /dev/null
@@ -1,239 +0,0 @@
-[
-  {
-    "type": "impl",
-    "name": "DojoModelImpl",
-    "interface_name": "dojo::model::IDojoModel"
-  },
-  {
-    "type": "struct",
-    "name": "core::array::Span::<core::integer::u8>",
-    "members": [
-      {
-        "name": "snapshot",
-        "type": "@core::array::Array::<core::integer::u8>"
-      }
-    ]
-  },
-  {
-    "type": "struct",
-    "name": "core::array::Span::<core::felt252>",
-    "members": [
-      {
-        "name": "snapshot",
-        "type": "@core::array::Array::<core::felt252>"
-      }
-    ]
-  },
-  {
-    "type": "struct",
-    "name": "core::array::Span::<core::array::Span::<core::felt252>>",
-    "members": [
-      {
-        "name": "snapshot",
-        "type": "@core::array::Array::<core::array::Span::<core::felt252>>"
-      }
-    ]
-  },
-  {
-    "type": "struct",
-    "name": "dojo::database::introspect::Struct",
-    "members": [
-      {
-        "name": "name",
-        "type": "core::felt252"
-      },
-      {
-        "name": "attrs",
-        "type": "core::array::Span::<core::felt252>"
-      },
-      {
-        "name": "children",
-        "type": "core::array::Span::<core::array::Span::<core::felt252>>"
-      }
-    ]
-  },
-  {
-    "type": "struct",
-    "name": "core::array::Span::<(core::felt252, core::array::Span::<core::felt252>)>",
-    "members": [
-      {
-        "name": "snapshot",
-        "type": "@core::array::Array::<(core::felt252, core::array::Span::<core::felt252>)>"
-      }
-    ]
-  },
-  {
-    "type": "struct",
-    "name": "dojo::database::introspect::Enum",
-    "members": [
-      {
-        "name": "name",
-        "type": "core::felt252"
-      },
-      {
-        "name": "attrs",
-        "type": "core::array::Span::<core::felt252>"
-      },
-      {
-        "name": "children",
-        "type": "core::array::Span::<(core::felt252, core::array::Span::<core::felt252>)>"
-      }
-    ]
-  },
-  {
-    "type": "enum",
-    "name": "dojo::database::introspect::Ty",
-    "variants": [
-      {
-        "name": "Primitive",
-        "type": "core::felt252"
-      },
-      {
-        "name": "Struct",
-        "type": "dojo::database::introspect::Struct"
-      },
-      {
-        "name": "Enum",
-        "type": "dojo::database::introspect::Enum"
-      },
-      {
-        "name": "Tuple",
-        "type": "core::array::Span::<core::array::Span::<core::felt252>>"
-      },
-      {
-        "name": "Array",
-        "type": "core::integer::u32"
-      }
-    ]
-  },
-  {
-    "type": "interface",
-    "name": "dojo::model::IDojoModel",
-    "items": [
-      {
-        "type": "function",
-        "name": "name",
-        "inputs": [],
-        "outputs": [
-          {
-            "type": "core::felt252"
-          }
-        ],
-        "state_mutability": "view"
-      },
-      {
-        "type": "function",
-        "name": "unpacked_size",
-        "inputs": [],
-        "outputs": [
-          {
-            "type": "core::integer::u32"
-          }
-        ],
-        "state_mutability": "view"
-      },
-      {
-        "type": "function",
-        "name": "packed_size",
-        "inputs": [],
-        "outputs": [
-          {
-            "type": "core::integer::u32"
-          }
-        ],
-        "state_mutability": "view"
-      },
-      {
-        "type": "function",
-        "name": "layout",
-        "inputs": [],
-        "outputs": [
-          {
-            "type": "core::array::Span::<core::integer::u8>"
-          }
-        ],
-        "state_mutability": "view"
-      },
-      {
-        "type": "function",
-        "name": "schema",
-        "inputs": [],
-        "outputs": [
-          {
-            "type": "dojo::database::introspect::Ty"
-          }
-        ],
-        "state_mutability": "view"
-      }
-    ]
-  },
-  {
-    "type": "impl",
-    "name": "movedImpl",
-    "interface_name": "dojo_examples::actions::actions::Imoved"
-  },
-  {
-    "type": "enum",
-    "name": "dojo_examples::models::Direction",
-    "variants": [
-      {
-        "name": "None",
-        "type": "()"
-      },
-      {
-        "name": "Left",
-        "type": "()"
-      },
-      {
-        "name": "Right",
-        "type": "()"
-      },
-      {
-        "name": "Up",
-        "type": "()"
-      },
-      {
-        "name": "Down",
-        "type": "()"
-      }
-    ]
-  },
-  {
-    "type": "struct",
-    "name": "dojo_examples::actions::actions::Moved",
-    "members": [
-      {
-        "name": "player",
-        "type": "core::starknet::contract_address::ContractAddress"
-      },
-      {
-        "name": "direction",
-        "type": "dojo_examples::models::Direction"
-      }
-    ]
-  },
-  {
-    "type": "interface",
-    "name": "dojo_examples::actions::actions::Imoved",
-    "items": [
-      {
-        "type": "function",
-        "name": "ensure_abi",
-        "inputs": [
-          {
-            "name": "model",
-            "type": "dojo_examples::actions::actions::Moved"
-          }
-        ],
-        "outputs": [],
-        "state_mutability": "view"
-      }
-    ]
-  },
-  {
-    "type": "event",
-    "name": "dojo_examples::actions::actions::moved::Event",
-    "kind": "enum",
-    "variants": []
-  }
-]
\ No newline at end of file
diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_emote_message.json b/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_emote_message.json
index 9598dfa5c7..aa5c588c2a 100644
--- a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_emote_message.json
+++ b/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_emote_message.json
@@ -32,6 +32,58 @@
       }
     ]
   },
+  {
+    "type": "enum",
+    "name": "dojo::model::FieldLayout",
+    "variants": [
+      {
+        "name": "Fixed",
+        "type": "core::array::Span::<core::integer::u8>"
+      },
+      {
+        "name": "Dynamic",
+        "type": "()"
+      }
+    ]
+  },
+  {
+    "type": "struct",
+    "name": "dojo::model::FieldData",
+    "members": [
+      {
+        "name": "selector",
+        "type": "core::felt252"
+      },
+      {
+        "name": "field_layout",
+        "type": "dojo::model::FieldLayout"
+      }
+    ]
+  },
+  {
+    "type": "struct",
+    "name": "core::array::Span::<dojo::model::FieldData>",
+    "members": [
+      {
+        "name": "snapshot",
+        "type": "@core::array::Array::<dojo::model::FieldData>"
+      }
+    ]
+  },
+  {
+    "type": "enum",
+    "name": "dojo::model::ModelLayout",
+    "variants": [
+      {
+        "name": "Serial",
+        "type": "core::array::Span::<core::integer::u8>"
+      },
+      {
+        "name": "Hash",
+        "type": "core::array::Span::<dojo::model::FieldData>"
+      }
+    ]
+  },
   {
     "type": "struct",
     "name": "core::array::Span::<core::felt252>",
@@ -189,7 +241,7 @@
         "inputs": [],
         "outputs": [
           {
-            "type": "core::array::Span::<core::integer::u8>"
+            "type": "dojo::model::ModelLayout"
           }
         ],
         "state_mutability": "view"
diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_moves.json b/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_moves.json
index bf54511fa1..f2969a85de 100644
--- a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_moves.json
+++ b/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_moves.json
@@ -32,6 +32,58 @@
       }
     ]
   },
+  {
+    "type": "enum",
+    "name": "dojo::model::FieldLayout",
+    "variants": [
+      {
+        "name": "Fixed",
+        "type": "core::array::Span::<core::integer::u8>"
+      },
+      {
+        "name": "Dynamic",
+        "type": "()"
+      }
+    ]
+  },
+  {
+    "type": "struct",
+    "name": "dojo::model::FieldData",
+    "members": [
+      {
+        "name": "selector",
+        "type": "core::felt252"
+      },
+      {
+        "name": "field_layout",
+        "type": "dojo::model::FieldLayout"
+      }
+    ]
+  },
+  {
+    "type": "struct",
+    "name": "core::array::Span::<dojo::model::FieldData>",
+    "members": [
+      {
+        "name": "snapshot",
+        "type": "@core::array::Array::<dojo::model::FieldData>"
+      }
+    ]
+  },
+  {
+    "type": "enum",
+    "name": "dojo::model::ModelLayout",
+    "variants": [
+      {
+        "name": "Serial",
+        "type": "core::array::Span::<core::integer::u8>"
+      },
+      {
+        "name": "Hash",
+        "type": "core::array::Span::<dojo::model::FieldData>"
+      }
+    ]
+  },
   {
     "type": "struct",
     "name": "core::array::Span::<core::felt252>",
@@ -189,7 +241,7 @@
         "inputs": [],
         "outputs": [
           {
-            "type": "core::array::Span::<core::integer::u8>"
+            "type": "dojo::model::ModelLayout"
           }
         ],
         "state_mutability": "view"
diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_position.json b/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_position.json
index ee5c34dde2..a6d870031a 100644
--- a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_position.json
+++ b/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_position.json
@@ -32,6 +32,58 @@
       }
     ]
   },
+  {
+    "type": "enum",
+    "name": "dojo::model::FieldLayout",
+    "variants": [
+      {
+        "name": "Fixed",
+        "type": "core::array::Span::<core::integer::u8>"
+      },
+      {
+        "name": "Dynamic",
+        "type": "()"
+      }
+    ]
+  },
+  {
+    "type": "struct",
+    "name": "dojo::model::FieldData",
+    "members": [
+      {
+        "name": "selector",
+        "type": "core::felt252"
+      },
+      {
+        "name": "field_layout",
+        "type": "dojo::model::FieldLayout"
+      }
+    ]
+  },
+  {
+    "type": "struct",
+    "name": "core::array::Span::<dojo::model::FieldData>",
+    "members": [
+      {
+        "name": "snapshot",
+        "type": "@core::array::Array::<dojo::model::FieldData>"
+      }
+    ]
+  },
+  {
+    "type": "enum",
+    "name": "dojo::model::ModelLayout",
+    "variants": [
+      {
+        "name": "Serial",
+        "type": "core::array::Span::<core::integer::u8>"
+      },
+      {
+        "name": "Hash",
+        "type": "core::array::Span::<dojo::model::FieldData>"
+      }
+    ]
+  },
   {
     "type": "struct",
     "name": "core::array::Span::<core::felt252>",
@@ -189,7 +241,7 @@
         "inputs": [],
         "outputs": [
           {
-            "type": "core::array::Span::<core::integer::u8>"
+            "type": "dojo::model::ModelLayout"
           }
         ],
         "state_mutability": "view"
diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples_actions_actions.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples_actions_actions.toml
index eb111f8f6a..ccbf937c14 100644
--- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples_actions_actions.toml
+++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples_actions_actions.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x52861e4eceb9e0115958328b36f73498a7b156ed1c573c970c37aaefb1d4ffa"
-original_class_hash = "0x52861e4eceb9e0115958328b36f73498a7b156ed1c573c970c37aaefb1d4ffa"
+class_hash = "0x74194e98bddd69b86e8c6790e0afbbdb897e4294bc9e31f321cd75e31e6525a"
+original_class_hash = "0x74194e98bddd69b86e8c6790e0afbbdb897e4294bc9e31f321cd75e31e6525a"
 base_class_hash = "0x0"
 abi = "manifests/dev/abis/base/contracts/dojo_examples_actions_actions.json"
 reads = []
diff --git a/examples/spawn-and-move/manifests/dev/base/dojo_world_world.toml b/examples/spawn-and-move/manifests/dev/base/dojo_world_world.toml
index f12d505f97..7c2e773386 100644
--- a/examples/spawn-and-move/manifests/dev/base/dojo_world_world.toml
+++ b/examples/spawn-and-move/manifests/dev/base/dojo_world_world.toml
@@ -1,5 +1,5 @@
 kind = "Class"
-class_hash = "0x3d4d3b30023220949d5389c16f8ec7d273f86017e02e7e90a1fb6840326457b"
-original_class_hash = "0x3d4d3b30023220949d5389c16f8ec7d273f86017e02e7e90a1fb6840326457b"
+class_hash = "0x26f58a27b6eaa3571cd1669c8d3a1b957f82a02eb56612de0660c312347ea3c"
+original_class_hash = "0x26f58a27b6eaa3571cd1669c8d3a1b957f82a02eb56612de0660c312347ea3c"
 abi = "manifests/dev/abis/base/dojo_world_world.json"
 name = "dojo::world::world"
diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_actions_actions_moved.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_actions_actions_moved.toml
deleted file mode 100644
index 51827417b0..0000000000
--- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_actions_actions_moved.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-kind = "DojoModel"
-class_hash = "0x52659850f9939482810d9f6b468b91dc99e0b7fa42c2016cf12833ec06ce911"
-original_class_hash = "0x52659850f9939482810d9f6b468b91dc99e0b7fa42c2016cf12833ec06ce911"
-abi = "manifests/dev/abis/base/models/dojo_examples_actions_actions_moved.json"
-name = "dojo_examples::actions::actions::moved"
-
-[[members]]
-name = "player"
-type = "ContractAddress"
-key = true
-
-[[members]]
-name = "direction"
-type = "Direction"
-key = false
diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_emote_message.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_emote_message.toml
index bfbcbbfa0b..3010e2c5e0 100644
--- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_emote_message.toml
+++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_emote_message.toml
@@ -1,6 +1,6 @@
 kind = "DojoModel"
-class_hash = "0xac011b068c4a746688a7aaf7c23d3eb89c9e6d27c4b587fab514013bdc3ee4"
-original_class_hash = "0xac011b068c4a746688a7aaf7c23d3eb89c9e6d27c4b587fab514013bdc3ee4"
+class_hash = "0x68dc8c04aff1b3f49f0a0068766b0231c6914310a6b65814514d47b83d4fe13"
+original_class_hash = "0x68dc8c04aff1b3f49f0a0068766b0231c6914310a6b65814514d47b83d4fe13"
 abi = "manifests/dev/abis/base/models/dojo_examples_models_emote_message.json"
 name = "dojo_examples::models::emote_message"
 
diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_moves.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_moves.toml
index 9c8d8c73e2..46bdabdaf8 100644
--- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_moves.toml
+++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_moves.toml
@@ -1,6 +1,6 @@
 kind = "DojoModel"
-class_hash = "0x794152290b915762781dc8cdd9e3c8ad9ae34f280f36c607fbe19e2d3c17d61"
-original_class_hash = "0x794152290b915762781dc8cdd9e3c8ad9ae34f280f36c607fbe19e2d3c17d61"
+class_hash = "0x7bc8bf8df370b915bdcf75a8abde3b41562e388dc80649ce77ac491d7bfe7c6"
+original_class_hash = "0x7bc8bf8df370b915bdcf75a8abde3b41562e388dc80649ce77ac491d7bfe7c6"
 abi = "manifests/dev/abis/base/models/dojo_examples_models_moves.json"
 name = "dojo_examples::models::moves"
 
diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_position.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_position.toml
index 10751f94e6..b305a8f90d 100644
--- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_position.toml
+++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_position.toml
@@ -1,6 +1,6 @@
 kind = "DojoModel"
-class_hash = "0x7aba2182c890a0bcc98666d373e9744e32983f466594d57023f3ab4fc6fb3e9"
-original_class_hash = "0x7aba2182c890a0bcc98666d373e9744e32983f466594d57023f3ab4fc6fb3e9"
+class_hash = "0x1b29510874bec0cba2271b21385c1483dfaa3f70836e00c65de56e2ca8de2ba"
+original_class_hash = "0x1b29510874bec0cba2271b21385c1483dfaa3f70836e00c65de56e2ca8de2ba"
 abi = "manifests/dev/abis/base/models/dojo_examples_models_position.json"
 name = "dojo_examples::models::position"