diff --git a/Cargo.lock b/Cargo.lock
index 9d272299cb..c0f3194955 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22,7 +22,7 @@ dependencies = [
  "auto_impl",
  "base64 0.22.1",
  "base64urlsafedata",
- "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
+ "cainome 0.2.3",
  "coset",
  "ecdsa",
  "futures",
@@ -2300,14 +2300,14 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
 [[package]]
 name = "cainome"
 version = "0.2.3"
-source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.1#db76fb849d1b7f3e9a2e943868bcd8616cf72e90"
+source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.2#4e3924fb82b7299d56d3619aa5d7b9863f581e0a"
 dependencies = [
  "anyhow",
  "async-trait",
- "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
- "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
- "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
- "cainome-rs-macro 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
+ "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
+ "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
+ "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
+ "cainome-rs-macro 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
  "camino",
  "clap",
  "clap_complete",
@@ -2324,15 +2324,16 @@ dependencies = [
 
 [[package]]
 name = "cainome"
-version = "0.2.3"
-source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.2#4e3924fb82b7299d56d3619aa5d7b9863f581e0a"
+version = "0.4.6"
+source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.6#0c30f74923f68bced7380848148c22a8fc65075d"
 dependencies = [
  "anyhow",
  "async-trait",
- "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
- "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
- "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
- "cainome-rs-macro 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
+ "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.6)",
+ "cainome-cairo-serde-derive",
+ "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.6)",
+ "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.6)",
+ "cainome-rs-macro 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.6)",
  "camino",
  "clap",
  "clap_complete",
@@ -2350,7 +2351,7 @@ dependencies = [
 [[package]]
 name = "cainome-cairo-serde"
 version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.1#db76fb849d1b7f3e9a2e943868bcd8616cf72e90"
+source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.2#4e3924fb82b7299d56d3619aa5d7b9863f581e0a"
 dependencies = [
  "serde",
  "starknet 0.12.0",
@@ -2360,17 +2361,28 @@ dependencies = [
 [[package]]
 name = "cainome-cairo-serde"
 version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.2#4e3924fb82b7299d56d3619aa5d7b9863f581e0a"
+source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.6#0c30f74923f68bced7380848148c22a8fc65075d"
 dependencies = [
  "serde",
  "starknet 0.12.0",
  "thiserror",
 ]
 
+[[package]]
+name = "cainome-cairo-serde-derive"
+version = "0.1.0"
+source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.6#0c30f74923f68bced7380848148c22a8fc65075d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+ "unzip-n",
+]
+
 [[package]]
 name = "cainome-parser"
 version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.1#db76fb849d1b7f3e9a2e943868bcd8616cf72e90"
+source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.2#4e3924fb82b7299d56d3619aa5d7b9863f581e0a"
 dependencies = [
  "convert_case 0.6.0",
  "quote",
@@ -2383,7 +2395,7 @@ dependencies = [
 [[package]]
 name = "cainome-parser"
 version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.2#4e3924fb82b7299d56d3619aa5d7b9863f581e0a"
+source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.6#0c30f74923f68bced7380848148c22a8fc65075d"
 dependencies = [
  "convert_case 0.6.0",
  "quote",
@@ -2396,11 +2408,11 @@ dependencies = [
 [[package]]
 name = "cainome-rs"
 version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.1#db76fb849d1b7f3e9a2e943868bcd8616cf72e90"
+source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.2#4e3924fb82b7299d56d3619aa5d7b9863f581e0a"
 dependencies = [
  "anyhow",
- "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
- "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
+ "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
+ "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
  "camino",
  "prettyplease",
  "proc-macro2",
@@ -2414,11 +2426,11 @@ dependencies = [
 [[package]]
 name = "cainome-rs"
 version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.2#4e3924fb82b7299d56d3619aa5d7b9863f581e0a"
+source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.6#0c30f74923f68bced7380848148c22a8fc65075d"
 dependencies = [
  "anyhow",
- "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
- "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
+ "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.6)",
+ "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.6)",
  "camino",
  "prettyplease",
  "proc-macro2",
@@ -2432,12 +2444,12 @@ dependencies = [
 [[package]]
 name = "cainome-rs-macro"
 version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.1#db76fb849d1b7f3e9a2e943868bcd8616cf72e90"
+source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.2#4e3924fb82b7299d56d3619aa5d7b9863f581e0a"
 dependencies = [
  "anyhow",
- "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
- "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
- "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
+ "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
+ "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
+ "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -2450,12 +2462,12 @@ dependencies = [
 [[package]]
 name = "cainome-rs-macro"
 version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.2#4e3924fb82b7299d56d3619aa5d7b9863f581e0a"
+source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.6#0c30f74923f68bced7380848148c22a8fc65075d"
 dependencies = [
  "anyhow",
- "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
- "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
- "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.2)",
+ "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.6)",
+ "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.6)",
+ "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.6)",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -4559,7 +4571,7 @@ version = "1.0.0-alpha.19"
 dependencies = [
  "assert_matches",
  "async-trait",
- "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
+ "cainome 0.4.6",
  "camino",
  "chrono",
  "convert_case 0.6.0",
@@ -4684,7 +4696,7 @@ dependencies = [
 name = "dojo-types"
 version = "1.0.0-alpha.19"
 dependencies = [
- "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
+ "cainome 0.4.6",
  "crypto-bigint",
  "hex",
  "itertools 0.12.1",
@@ -4720,7 +4732,7 @@ dependencies = [
  "assert_fs",
  "assert_matches",
  "async-trait",
- "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
+ "cainome 0.4.6",
  "cairo-lang-filesystem",
  "cairo-lang-project",
  "cairo-lang-starknet",
@@ -8273,7 +8285,7 @@ dependencies = [
  "alloy-primitives",
  "anyhow",
  "assert_matches",
- "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
+ "cainome 0.4.6",
  "dojo-metrics",
  "dojo-test-utils",
  "dojo-utils",
@@ -13196,7 +13208,7 @@ dependencies = [
  "assert_fs",
  "async-trait",
  "bigdecimal 0.4.5",
- "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
+ "cainome 0.4.6",
  "cairo-lang-compiler",
  "cairo-lang-defs",
  "cairo-lang-filesystem",
@@ -13260,7 +13272,7 @@ dependencies = [
  "assert_fs",
  "async-trait",
  "bigdecimal 0.4.5",
- "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
+ "cainome 0.4.6",
  "cairo-lang-compiler",
  "cairo-lang-defs",
  "cairo-lang-filesystem",
@@ -14896,7 +14908,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.7",
  "bitflags 2.6.0",
- "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
+ "cainome 0.4.6",
  "camino",
  "chrono",
  "crypto-bigint",
@@ -14969,7 +14981,7 @@ dependencies = [
 name = "torii-grpc"
 version = "1.0.0-alpha.19"
 dependencies = [
- "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
+ "cainome 0.4.6",
  "camino",
  "crypto-bigint",
  "dojo-test-utils",
@@ -15016,7 +15028,7 @@ name = "torii-relay"
 version = "1.0.0-alpha.19"
 dependencies = [
  "anyhow",
- "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)",
+ "cainome 0.4.6",
  "chrono",
  "crypto-bigint",
  "dojo-types",
@@ -15571,6 +15583,17 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
+[[package]]
+name = "unzip-n"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2e7e85a0596447f0f2ac090e16bc4c516c6fe91771fb0c0ccf7fa3dae896b9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "url"
 version = "2.5.2"
diff --git a/Cargo.toml b/Cargo.toml
index 0132a5b765..af0729158d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -62,7 +62,7 @@ inherits = "release"
 lto = "fat"
 
 [workspace.dependencies]
-cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.4.1", features = [ "abigen-rs" ] }
+cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.4.6", features = [ "abigen-rs" ] }
 dojo-utils = { path = "crates/dojo-utils" }
 
 # metrics
@@ -216,7 +216,7 @@ warp = "0.3"
 
 # gRPC
 prost = "0.12"
-tonic = { version = "0.11", features = [ "tls", "tls-roots", "gzip" ] }
+tonic = { version = "0.11", features = [ "gzip", "tls", "tls-roots" ] }
 tonic-build = "0.11"
 tonic-reflection = "0.11"
 tonic-web = "0.11"
diff --git a/crates/dojo-bindgen/src/plugins/mod.rs b/crates/dojo-bindgen/src/plugins/mod.rs
index a706498cf5..71d51964b5 100644
--- a/crates/dojo-bindgen/src/plugins/mod.rs
+++ b/crates/dojo-bindgen/src/plugins/mod.rs
@@ -33,6 +33,7 @@ impl fmt::Display for BuiltinPlugins {
     }
 }
 
+#[derive(Debug)]
 pub struct Buffer(Vec<String>);
 impl Buffer {
     pub fn new() -> Self {
diff --git a/crates/dojo-bindgen/src/plugins/typescript/generator/erc.rs b/crates/dojo-bindgen/src/plugins/typescript/generator/erc.rs
index 162bbc6990..b731dcfe3c 100644
--- a/crates/dojo-bindgen/src/plugins/typescript/generator/erc.rs
+++ b/crates/dojo-bindgen/src/plugins/typescript/generator/erc.rs
@@ -34,11 +34,11 @@ const ERC_TORII_TYPES: &str = "\n\t\tERC__Balance: ERC__Balance,\n\t\tERC__Token
                                ERC__Token,\n\t\tERC__Transfer: ERC__Transfer,";
 const ERC_TORII_INIT: &str = "
 \t\tERC__Balance: {
-\t\t\tfieldorder: ['balance', 'type', 'tokenmetadata'],
+\t\t\tfieldOrder: ['balance', 'type', 'tokenmetadata'],
 \t\t\tbalance: '',
 \t\t\ttype: 'ERC20',
 \t\t\ttokenMetadata: {
-\t\t\t\tfieldorder: ['name', 'symbol', 'tokenId', 'decimals', 'contractAddress'],
+\t\t\t\tfieldOrder: ['name', 'symbol', 'tokenId', 'decimals', 'contractAddress'],
 \t\t\t\tname: '',
 \t\t\t\tsymbol: '',
 \t\t\t\ttokenId: '',
diff --git a/crates/dojo-bindgen/src/plugins/typescript/generator/function.rs b/crates/dojo-bindgen/src/plugins/typescript/generator/function.rs
index 5af320fa17..b76a7d1aec 100644
--- a/crates/dojo-bindgen/src/plugins/typescript/generator/function.rs
+++ b/crates/dojo-bindgen/src/plugins/typescript/generator/function.rs
@@ -18,7 +18,7 @@ impl TsFunctionGenerator {
     }
 
     fn setup_function_wrapper_start(&self, buffer: &mut Buffer) -> usize {
-        let fn_wrapper = "export async function setupWorld(provider: DojoProvider) {{\n";
+        let fn_wrapper = "export async function setupWorld(provider: DojoProvider) {\n";
 
         if !buffer.has(fn_wrapper) {
             buffer.push(fn_wrapper.to_owned());
diff --git a/crates/dojo-bindgen/src/plugins/typescript/generator/mod.rs b/crates/dojo-bindgen/src/plugins/typescript/generator/mod.rs
index 9e53bb2ffb..2c33e067c2 100644
--- a/crates/dojo-bindgen/src/plugins/typescript/generator/mod.rs
+++ b/crates/dojo-bindgen/src/plugins/typescript/generator/mod.rs
@@ -124,13 +124,14 @@ impl From<&Composite> for JsDefaultValue {
                 JsDefaultValue(format!("{}.{}", value.type_name(), value.inners[0].name))
             }
             cainome::parser::tokens::CompositeType::Struct => JsDefaultValue(format!(
-                "{{ {} }}",
+                "{{ fieldOrder: [{}], {} }}",
+                value.inners.iter().map(|i| format!("'{}'", i.name)).collect::<Vec<_>>().join(", "),
                 value
                     .inners
                     .iter()
                     .map(|i| format!("{}: {},", i.name, JsDefaultValue::from(&i.token)))
                     .collect::<Vec<_>>()
-                    .join("\n")
+                    .join(" ")
             )),
             _ => JsDefaultValue::from(value.type_name().as_str()),
         }
diff --git a/crates/dojo-bindgen/src/plugins/typescript/generator/schema.rs b/crates/dojo-bindgen/src/plugins/typescript/generator/schema.rs
index d72efddca8..e906eb6cc3 100644
--- a/crates/dojo-bindgen/src/plugins/typescript/generator/schema.rs
+++ b/crates/dojo-bindgen/src/plugins/typescript/generator/schema.rs
@@ -197,6 +197,15 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_handle_nested_struct() {
+        let generator = TsSchemaGenerator {};
+        let mut buffer = Buffer::new();
+        let nested_struct = create_test_nested_struct_token("TestNestedStruct");
+        let _res = generator.generate(&nested_struct, &mut buffer);
+        assert_eq!(buffer.len(), 3);
+    }
+
     fn create_test_struct_token(name: &str) -> Composite {
         Composite {
             type_path: format!("onchain_dash::{name}"),
@@ -226,4 +235,80 @@ mod tests {
             alias: None,
         }
     }
+
+    pub fn create_test_nested_struct_token(name: &str) -> Composite {
+        Composite {
+            type_path: format!("onchain_dash::{name}"),
+            inners: vec![
+                CompositeInner {
+                    index: 0,
+                    name: "field1".to_owned(),
+                    kind: CompositeInnerKind::Key,
+                    token: Token::Array(cainome::parser::tokens::Array {
+                        type_path: "core::array::Array::<onchain_dah::Direction>".to_owned(),
+                        inner: Box::new(Token::Composite(Composite {
+                            type_path: "onchain_dah::Direction".to_owned(),
+                            inners: vec![
+                                CompositeInner {
+                                    index: 0,
+                                    name: "None".to_owned(),
+                                    kind: CompositeInnerKind::Key,
+                                    token: Token::CoreBasic(CoreBasic {
+                                        type_path: "core::fetl252".to_owned(),
+                                    }),
+                                },
+                                CompositeInner {
+                                    index: 1,
+                                    name: "North".to_owned(),
+                                    kind: CompositeInnerKind::Key,
+                                    token: Token::CoreBasic(CoreBasic {
+                                        type_path: "core::fetl252".to_owned(),
+                                    }),
+                                },
+                                CompositeInner {
+                                    index: 2,
+                                    name: "South".to_owned(),
+                                    kind: CompositeInnerKind::Key,
+                                    token: Token::CoreBasic(CoreBasic {
+                                        type_path: "core::fetl252".to_owned(),
+                                    }),
+                                },
+                                CompositeInner {
+                                    index: 3,
+                                    name: "West".to_owned(),
+                                    kind: CompositeInnerKind::Key,
+                                    token: Token::CoreBasic(CoreBasic {
+                                        type_path: "core::fetl252".to_owned(),
+                                    }),
+                                },
+                                CompositeInner {
+                                    index: 4,
+                                    name: "East".to_owned(),
+                                    kind: CompositeInnerKind::Key,
+                                    token: Token::CoreBasic(CoreBasic {
+                                        type_path: "core::fetl252".to_owned(),
+                                    }),
+                                },
+                            ],
+                            generic_args: vec![],
+                            r#type: CompositeType::Enum,
+                            is_event: false,
+                            alias: None,
+                        })),
+                        is_legacy: false,
+                    }),
+                },
+                CompositeInner {
+                    index: 1,
+                    name: "field2".to_owned(),
+                    kind: CompositeInnerKind::Key,
+                    token: Token::Composite(create_test_struct_token("Position")),
+                },
+            ],
+            generic_args: vec![],
+            r#type: CompositeType::Struct,
+            is_event: false,
+            alias: None,
+        }
+    }
 }
diff --git a/crates/dojo-world/abigen/src/main.rs b/crates/dojo-world/abigen/src/main.rs
index 1adc7f9782..c4dec4702d 100644
--- a/crates/dojo-world/abigen/src/main.rs
+++ b/crates/dojo-world/abigen/src/main.rs
@@ -85,7 +85,7 @@ fn get_bindings_file_content(contract_name: &str, contract_class: ContractClass)
          --bin dojo-world-abigen` instead.\nuse cainome::rs::abigen;\n\nabigen!(\n    {},\n    \
          r#\"{}\"#,\ntype_aliases {{\ndojo::world::config::Config::Event as \
          DojoConfigEvent;\n}},derives(Debug, serde::Serialize, serde::Deserialize, PartialEq, Eq, \
-         Clone)\n);",
+         Clone),contract_derives(Debug)\n);",
         contract_name,
         serde_json::to_string_pretty(&contract_class.abi).unwrap()
     )
diff --git a/crates/dojo-world/src/contracts/abi/model.rs b/crates/dojo-world/src/contracts/abi/model.rs
index 13b5804fa1..da4cf01ee1 100644
--- a/crates/dojo-world/src/contracts/abi/model.rs
+++ b/crates/dojo-world/src/contracts/abi/model.rs
@@ -325,5 +325,5 @@ abigen!(
 ]"#,
 type_aliases {
 dojo::world::config::Config::Event as DojoConfigEvent;
-},derives(Debug, serde::Serialize, serde::Deserialize, PartialEq, Eq, Clone)
+},derives(Debug, serde::Serialize, serde::Deserialize, PartialEq, Eq, Clone),contract_derives(Debug)
 );
diff --git a/crates/dojo-world/src/contracts/abi/world.rs b/crates/dojo-world/src/contracts/abi/world.rs
index d525afb39a..bba5aa4b44 100644
--- a/crates/dojo-world/src/contracts/abi/world.rs
+++ b/crates/dojo-world/src/contracts/abi/world.rs
@@ -1237,5 +1237,5 @@ abigen!(
 ]"#,
 type_aliases {
 dojo::world::config::Config::Event as DojoConfigEvent;
-},derives(Debug, serde::Serialize, serde::Deserialize, PartialEq, Eq, Clone)
+},derives(Debug, serde::Serialize, serde::Deserialize, PartialEq, Eq, Clone),contract_derives(Debug)
 );
diff --git a/examples/spawn-and-move/manifests/dev/deployment/manifest.json b/examples/spawn-and-move/manifests/dev/deployment/manifest.json
index c3d4991c46..58e6346d19 100644
--- a/examples/spawn-and-move/manifests/dev/deployment/manifest.json
+++ b/examples/spawn-and-move/manifests/dev/deployment/manifest.json
@@ -1235,7 +1235,7 @@
       }
     ],
     "address": "0x46c1fd10836a8426197bf412fc5f26ea10f11a8d5c61474407f03f82c096593",
-    "transaction_hash": "0x7f540b040b1638b76a7f2a8fc13a33050d1c0556a63814f319a01d022b172cf",
+    "transaction_hash": "0x260b430cd6b661142ae2e60699a3abb0bf4b2e10c36ab723d96f619a99859f7",
     "block_number": 3,
     "seed": "dojo_examples",
     "metadata": {
diff --git a/examples/spawn-and-move/manifests/dev/deployment/manifest.toml b/examples/spawn-and-move/manifests/dev/deployment/manifest.toml
index 4e1ffec809..bafe2c4a2a 100644
--- a/examples/spawn-and-move/manifests/dev/deployment/manifest.toml
+++ b/examples/spawn-and-move/manifests/dev/deployment/manifest.toml
@@ -4,7 +4,7 @@ class_hash = "0x6f38d5d9507c5d9546290e1a27e309efe5a9af3770b6cc1627db4a1b90a7dce"
 original_class_hash = "0x6f38d5d9507c5d9546290e1a27e309efe5a9af3770b6cc1627db4a1b90a7dce"
 abi = "manifests/dev/deployment/abis/dojo-world.json"
 address = "0x46c1fd10836a8426197bf412fc5f26ea10f11a8d5c61474407f03f82c096593"
-transaction_hash = "0x7f540b040b1638b76a7f2a8fc13a33050d1c0556a63814f319a01d022b172cf"
+transaction_hash = "0x260b430cd6b661142ae2e60699a3abb0bf4b2e10c36ab723d96f619a99859f7"
 block_number = 3
 seed = "dojo_examples"
 manifest_name = "dojo-world"
diff --git a/spawn-and-move-db.tar.gz b/spawn-and-move-db.tar.gz
index 8fc827921b..935df0c037 100644
Binary files a/spawn-and-move-db.tar.gz and b/spawn-and-move-db.tar.gz differ
diff --git a/types-test-db.tar.gz b/types-test-db.tar.gz
index f1894f1b36..d9f699a895 100644
Binary files a/types-test-db.tar.gz and b/types-test-db.tar.gz differ