diff --git a/crates/benches/src/deployer.rs b/crates/benches/src/deployer.rs
index ad4db203a1..d13c4e5ad3 100644
--- a/crates/benches/src/deployer.rs
+++ b/crates/benches/src/deployer.rs
@@ -57,7 +57,7 @@ async fn deploy_contract(runner: &KatanaRunner, manifest_and_script: (&str, &str
 
     let out = Command::new("bash")
         .arg(manifest_and_script.1)
-        .env("RPC_URL", &runner.endpoint())
+        .env("RPC_URL", runner.endpoint())
         .output()
         .await
         .context("failed to start script subprocess")?;
diff --git a/crates/common/src/parse.rs b/crates/common/src/parse.rs
index a58d0c3d0c..5e74057d30 100644
--- a/crates/common/src/parse.rs
+++ b/crates/common/src/parse.rs
@@ -24,7 +24,7 @@ pub enum SocketAddressParsingError {
 /// The following formats are checked:
 ///
 /// - If the value can be parsed as a `u16` or starts with `:` it is considered a port, and the
-/// hostname is set to `localhost`.
+///   hostname is set to `localhost`.
 /// - If the value contains `:` it is assumed to be the format `<host>:<port>`
 /// - Otherwise it is assumed to be a hostname
 ///
diff --git a/crates/dojo-lang/src/contract.rs b/crates/dojo-lang/src/contract.rs
index 03644daf56..ef33519f92 100644
--- a/crates/dojo-lang/src/contract.rs
+++ b/crates/dojo-lang/src/contract.rs
@@ -646,7 +646,7 @@ fn get_contract_namespace(
 ///
 /// Returns:
 /// * A [`ContractParameters`] object containing all the dojo::contract parameters with their
-/// default values if not set in the code.
+///   default values if not set in the code.
 fn get_parameters(
     db: &dyn SyntaxGroup,
     module_ast: &ast::ItemModule,
diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock
index d4194cb946..aef7bfa970 100644
--- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock
+++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock
@@ -10,7 +10,7 @@ dependencies = [
 
 [[package]]
 name = "dojo"
-version = "0.7.3"
+version = "1.0.0-alpha.4"
 dependencies = [
  "dojo_plugin",
 ]
diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml
index 59d4719031..5ebf245a91 100644
--- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml
+++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml
@@ -1,6 +1,6 @@
 kind = "Class"
-class_hash = "0x2178527e9556d1aa21d3c2961d28f9114fcfed81b4c3674ed591c50ce46cc9d"
-original_class_hash = "0x2178527e9556d1aa21d3c2961d28f9114fcfed81b4c3674ed591c50ce46cc9d"
+class_hash = "0x14287624e97e0312d4e680e19071efce983810e909b32afc54cd9c8031f4c1c"
+original_class_hash = "0x14287624e97e0312d4e680e19071efce983810e909b32afc54cd9c8031f4c1c"
 abi = "manifests/dev/base/abis/dojo-world.json"
 tag = "dojo-world"
 manifest_name = "dojo-world"
diff --git a/crates/dojo-lang/src/model.rs b/crates/dojo-lang/src/model.rs
index 3de4909d5f..600f1fc87f 100644
--- a/crates/dojo-lang/src/model.rs
+++ b/crates/dojo-lang/src/model.rs
@@ -118,8 +118,8 @@ fn get_model_namespace(
 /// * diagnostics: vector of compiler diagnostics.
 ///
 /// Returns:
-/// * A [`ModelParameters`] object containing all the dojo::model parameters with their
-/// default values if not set in the code.
+/// * A [`ModelParameters`] object containing all the dojo::model parameters with their default
+///   values if not set in the code.
 fn get_model_parameters(
     db: &dyn SyntaxGroup,
     struct_ast: ItemStruct,
@@ -198,6 +198,7 @@ fn get_model_parameters(
 /// Parameters:
 /// * db: The semantic database.
 /// * struct_ast: The AST of the model struct.
+///
 /// Returns:
 /// * A RewriteNode containing the generated code.
 pub fn handle_model_struct(
diff --git a/crates/dojo-lang/src/plugin_test_data/system b/crates/dojo-lang/src/plugin_test_data/system
index 94e8878240..4b42963654 100644
--- a/crates/dojo-lang/src/plugin_test_data/system
+++ b/crates/dojo-lang/src/plugin_test_data/system
@@ -605,38 +605,41 @@ pub struct Storage {
 }
 
 #[derive(Drop, Copy)]
-pub struct ComponentStorageBase {
+pub struct StorageStorageBase {
 }
-#[derive(Drop, Copy)]
-pub struct ComponentStorageBaseMut {
-}
-impl StorageBaseImpl<TContractState> of starknet::storage::StorageBaseTrait<ComponentState<TContractState>> {
-    type BaseType = ComponentStorageBase;
-    type BaseMutType = ComponentStorageBaseMut;
-    fn storage_base(self: @ComponentState<TContractState>) -> ComponentStorageBase {
-        ComponentStorageBase {
+impl StorageStorageImpl of starknet::storage::StorageTrait<Storage> {
+    type BaseType = StorageStorageBase;
+    fn storage(self: starknet::storage::FlattenedStorage<Storage>) -> StorageStorageBase {
+        StorageStorageBase {
         }
     }
-    fn storage_base_mut(ref self: ComponentState<TContractState>) -> ComponentStorageBaseMut {
-        ComponentStorageBaseMut {
+}
+#[derive(Drop, Copy)]
+pub struct StorageStorageBaseMut {
+}
+impl StorageStorageMutImpl of starknet::storage::StorageTraitMut<Storage> {
+    type BaseType = StorageStorageBaseMut;
+    fn storage_mut(self: starknet::storage::FlattenedStorage<starknet::storage::Mutable::<Storage>>) -> StorageStorageBaseMut {
+        StorageStorageBaseMut {
         }
     }
 }
+
 pub struct ComponentState<TContractState> {
 }
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
  
 impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
-    type Target = ComponentStorageBase;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> ComponentStorageBase {
-        self.storage_base()
+    type Target = starknet::storage::FlattenedStorage<Storage>;
+    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+        starknet::storage::FlattenedStorage {}
     }
 }
 impl ComponentStateDerefMut<TContractState> of core::ops::DerefMut<ComponentState<TContractState>> {
-    type Target = ComponentStorageBaseMut;
-    fn deref_mut(ref self: ComponentState<TContractState>) -> ComponentStorageBaseMut {
-        self.storage_base_mut()
+    type Target = starknet::storage::FlattenedStorage<starknet::storage::Mutable<Storage>> ;
+    fn deref_mut(ref self: ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<starknet::storage::Mutable<Storage>> {
+        starknet::storage::FlattenedStorage {}
     }
 }
 pub fn unsafe_new_component_state<TContractState>() -> ComponentState<TContractState> {
@@ -673,10 +676,10 @@ impl EventIsEvent of starknet::Event<Event> {
         Option::None
     }
 }
-impl ComponentStorageBaseDrop of core::traits::Drop::<ComponentStorageBase>;
-impl ComponentStorageBaseCopy of core::traits::Copy::<ComponentStorageBase>;
-impl ComponentStorageBaseMutDrop of core::traits::Drop::<ComponentStorageBaseMut>;
-impl ComponentStorageBaseMutCopy of core::traits::Copy::<ComponentStorageBaseMut>;
+impl StorageStorageBaseDrop of core::traits::Drop::<StorageStorageBase>;
+impl StorageStorageBaseCopy of core::traits::Copy::<StorageStorageBase>;
+impl StorageStorageBaseMutDrop of core::traits::Drop::<StorageStorageBaseMut>;
+impl StorageStorageBaseMutCopy of core::traits::Copy::<StorageStorageBaseMut>;
 }
 
 #[starknet::component]
@@ -691,38 +694,41 @@ pub struct Storage {
 }
 
 #[derive(Drop, Copy)]
-pub struct ComponentStorageBase {
+pub struct StorageStorageBase {
 }
-#[derive(Drop, Copy)]
-pub struct ComponentStorageBaseMut {
-}
-impl StorageBaseImpl<TContractState> of starknet::storage::StorageBaseTrait<ComponentState<TContractState>> {
-    type BaseType = ComponentStorageBase;
-    type BaseMutType = ComponentStorageBaseMut;
-    fn storage_base(self: @ComponentState<TContractState>) -> ComponentStorageBase {
-        ComponentStorageBase {
+impl StorageStorageImpl of starknet::storage::StorageTrait<Storage> {
+    type BaseType = StorageStorageBase;
+    fn storage(self: starknet::storage::FlattenedStorage<Storage>) -> StorageStorageBase {
+        StorageStorageBase {
         }
     }
-    fn storage_base_mut(ref self: ComponentState<TContractState>) -> ComponentStorageBaseMut {
-        ComponentStorageBaseMut {
+}
+#[derive(Drop, Copy)]
+pub struct StorageStorageBaseMut {
+}
+impl StorageStorageMutImpl of starknet::storage::StorageTraitMut<Storage> {
+    type BaseType = StorageStorageBaseMut;
+    fn storage_mut(self: starknet::storage::FlattenedStorage<starknet::storage::Mutable::<Storage>>) -> StorageStorageBaseMut {
+        StorageStorageBaseMut {
         }
     }
 }
+
 pub struct ComponentState<TContractState> {
 }
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
  
 impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
-    type Target = ComponentStorageBase;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> ComponentStorageBase {
-        self.storage_base()
+    type Target = starknet::storage::FlattenedStorage<Storage>;
+    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+        starknet::storage::FlattenedStorage {}
     }
 }
 impl ComponentStateDerefMut<TContractState> of core::ops::DerefMut<ComponentState<TContractState>> {
-    type Target = ComponentStorageBaseMut;
-    fn deref_mut(ref self: ComponentState<TContractState>) -> ComponentStorageBaseMut {
-        self.storage_base_mut()
+    type Target = starknet::storage::FlattenedStorage<starknet::storage::Mutable<Storage>> ;
+    fn deref_mut(ref self: ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<starknet::storage::Mutable<Storage>> {
+        starknet::storage::FlattenedStorage {}
     }
 }
 pub fn unsafe_new_component_state<TContractState>() -> ComponentState<TContractState> {
@@ -759,10 +765,10 @@ impl EventIsEvent of starknet::Event<Event> {
         Option::None
     }
 }
-impl ComponentStorageBaseDrop of core::traits::Drop::<ComponentStorageBase>;
-impl ComponentStorageBaseCopy of core::traits::Copy::<ComponentStorageBase>;
-impl ComponentStorageBaseMutDrop of core::traits::Drop::<ComponentStorageBaseMut>;
-impl ComponentStorageBaseMutCopy of core::traits::Copy::<ComponentStorageBaseMut>;
+impl StorageStorageBaseDrop of core::traits::Drop::<StorageStorageBase>;
+impl StorageStorageBaseCopy of core::traits::Copy::<StorageStorageBase>;
+impl StorageStorageBaseMutDrop of core::traits::Drop::<StorageStorageBaseMut>;
+impl StorageStorageBaseMutCopy of core::traits::Copy::<StorageStorageBaseMut>;
 }
 
 #[dojo::contract]
@@ -1788,17 +1794,17 @@ impl StoreIEmptyTraitDispatcher of starknet::Store::<IEmptyTraitDispatcher> {
 }
 
 #[derive(Drop, Copy)]
-struct IEmptyTraitDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
+pub struct IEmptyTraitDispatcherSubPointers {
+    pub contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
 }
 impl IEmptyTraitDispatcherSubPointersImpl of starknet::storage::SubPointers<IEmptyTraitDispatcher> {
-type SubPointersType = IEmptyTraitDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<IEmptyTraitDispatcher>) -> IEmptyTraitDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = IEmptyTraitDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<IEmptyTraitDispatcher>) -> IEmptyTraitDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 IEmptyTraitDispatcherSubPointers {
            contract_address: contract_address_value,
@@ -1806,19 +1812,19 @@ type SubPointersType = IEmptyTraitDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableIEmptyTraitDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
-}
-impl MutableIEmptyTraitDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<IEmptyTraitDispatcher> {
-type SubPointersType = MutableIEmptyTraitDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IEmptyTraitDispatcher>>) -> MutableIEmptyTraitDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct IEmptyTraitDispatcherSubPointersMut {
+    pub contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
+}
+impl IEmptyTraitDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<IEmptyTraitDispatcher> {
+    type SubPointersType = IEmptyTraitDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IEmptyTraitDispatcher>>) -> IEmptyTraitDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableIEmptyTraitDispatcherSubPointers {
+                IEmptyTraitDispatcherSubPointersMut {
            contract_address: contract_address_value,
         }
     }
@@ -1868,17 +1874,17 @@ impl StoreIEmptyTraitLibraryDispatcher of starknet::Store::<IEmptyTraitLibraryDi
 }
 
 #[derive(Drop, Copy)]
-struct IEmptyTraitLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
+pub struct IEmptyTraitLibraryDispatcherSubPointers {
+    pub class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
 }
 impl IEmptyTraitLibraryDispatcherSubPointersImpl of starknet::storage::SubPointers<IEmptyTraitLibraryDispatcher> {
-type SubPointersType = IEmptyTraitLibraryDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<IEmptyTraitLibraryDispatcher>) -> IEmptyTraitLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = IEmptyTraitLibraryDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<IEmptyTraitLibraryDispatcher>) -> IEmptyTraitLibraryDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 IEmptyTraitLibraryDispatcherSubPointers {
            class_hash: class_hash_value,
@@ -1886,19 +1892,19 @@ type SubPointersType = IEmptyTraitLibraryDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableIEmptyTraitLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
-}
-impl MutableIEmptyTraitLibraryDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<IEmptyTraitLibraryDispatcher> {
-type SubPointersType = MutableIEmptyTraitLibraryDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IEmptyTraitLibraryDispatcher>>) -> MutableIEmptyTraitLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct IEmptyTraitLibraryDispatcherSubPointersMut {
+    pub class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
+}
+impl IEmptyTraitLibraryDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<IEmptyTraitLibraryDispatcher> {
+    type SubPointersType = IEmptyTraitLibraryDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IEmptyTraitLibraryDispatcher>>) -> IEmptyTraitLibraryDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableIEmptyTraitLibraryDispatcherSubPointers {
+                IEmptyTraitLibraryDispatcherSubPointersMut {
            class_hash: class_hash_value,
         }
     }
@@ -1948,17 +1954,17 @@ impl StoreIEmptyTraitSafeLibraryDispatcher of starknet::Store::<IEmptyTraitSafeL
 }
 
 #[derive(Drop, Copy)]
-struct IEmptyTraitSafeLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
+pub struct IEmptyTraitSafeLibraryDispatcherSubPointers {
+    pub class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
 }
 impl IEmptyTraitSafeLibraryDispatcherSubPointersImpl of starknet::storage::SubPointers<IEmptyTraitSafeLibraryDispatcher> {
-type SubPointersType = IEmptyTraitSafeLibraryDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<IEmptyTraitSafeLibraryDispatcher>) -> IEmptyTraitSafeLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = IEmptyTraitSafeLibraryDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<IEmptyTraitSafeLibraryDispatcher>) -> IEmptyTraitSafeLibraryDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 IEmptyTraitSafeLibraryDispatcherSubPointers {
            class_hash: class_hash_value,
@@ -1966,19 +1972,19 @@ type SubPointersType = IEmptyTraitSafeLibraryDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableIEmptyTraitSafeLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
-}
-impl MutableIEmptyTraitSafeLibraryDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<IEmptyTraitSafeLibraryDispatcher> {
-type SubPointersType = MutableIEmptyTraitSafeLibraryDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IEmptyTraitSafeLibraryDispatcher>>) -> MutableIEmptyTraitSafeLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct IEmptyTraitSafeLibraryDispatcherSubPointersMut {
+    pub class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
+}
+impl IEmptyTraitSafeLibraryDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<IEmptyTraitSafeLibraryDispatcher> {
+    type SubPointersType = IEmptyTraitSafeLibraryDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IEmptyTraitSafeLibraryDispatcher>>) -> IEmptyTraitSafeLibraryDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableIEmptyTraitSafeLibraryDispatcherSubPointers {
+                IEmptyTraitSafeLibraryDispatcherSubPointersMut {
            class_hash: class_hash_value,
         }
     }
@@ -2028,17 +2034,17 @@ impl StoreIEmptyTraitSafeDispatcher of starknet::Store::<IEmptyTraitSafeDispatch
 }
 
 #[derive(Drop, Copy)]
-struct IEmptyTraitSafeDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
+pub struct IEmptyTraitSafeDispatcherSubPointers {
+    pub contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
 }
 impl IEmptyTraitSafeDispatcherSubPointersImpl of starknet::storage::SubPointers<IEmptyTraitSafeDispatcher> {
-type SubPointersType = IEmptyTraitSafeDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<IEmptyTraitSafeDispatcher>) -> IEmptyTraitSafeDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = IEmptyTraitSafeDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<IEmptyTraitSafeDispatcher>) -> IEmptyTraitSafeDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 IEmptyTraitSafeDispatcherSubPointers {
            contract_address: contract_address_value,
@@ -2046,19 +2052,19 @@ type SubPointersType = IEmptyTraitSafeDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableIEmptyTraitSafeDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
-}
-impl MutableIEmptyTraitSafeDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<IEmptyTraitSafeDispatcher> {
-type SubPointersType = MutableIEmptyTraitSafeDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IEmptyTraitSafeDispatcher>>) -> MutableIEmptyTraitSafeDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct IEmptyTraitSafeDispatcherSubPointersMut {
+    pub contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
+}
+impl IEmptyTraitSafeDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<IEmptyTraitSafeDispatcher> {
+    type SubPointersType = IEmptyTraitSafeDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IEmptyTraitSafeDispatcher>>) -> IEmptyTraitSafeDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableIEmptyTraitSafeDispatcherSubPointers {
+                IEmptyTraitSafeDispatcherSubPointersMut {
            contract_address: contract_address_value,
         }
     }
@@ -2108,17 +2114,17 @@ impl StoreIFaultyTraitDispatcher of starknet::Store::<IFaultyTraitDispatcher> {
 }
 
 #[derive(Drop, Copy)]
-struct IFaultyTraitDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
+pub struct IFaultyTraitDispatcherSubPointers {
+    pub contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
 }
 impl IFaultyTraitDispatcherSubPointersImpl of starknet::storage::SubPointers<IFaultyTraitDispatcher> {
-type SubPointersType = IFaultyTraitDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitDispatcher>) -> IFaultyTraitDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = IFaultyTraitDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitDispatcher>) -> IFaultyTraitDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 IFaultyTraitDispatcherSubPointers {
            contract_address: contract_address_value,
@@ -2126,19 +2132,19 @@ type SubPointersType = IFaultyTraitDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableIFaultyTraitDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
-}
-impl MutableIFaultyTraitDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<IFaultyTraitDispatcher> {
-type SubPointersType = MutableIFaultyTraitDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitDispatcher>>) -> MutableIFaultyTraitDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct IFaultyTraitDispatcherSubPointersMut {
+    pub contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
+}
+impl IFaultyTraitDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<IFaultyTraitDispatcher> {
+    type SubPointersType = IFaultyTraitDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitDispatcher>>) -> IFaultyTraitDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableIFaultyTraitDispatcherSubPointers {
+                IFaultyTraitDispatcherSubPointersMut {
            contract_address: contract_address_value,
         }
     }
@@ -2188,17 +2194,17 @@ impl StoreIFaultyTraitLibraryDispatcher of starknet::Store::<IFaultyTraitLibrary
 }
 
 #[derive(Drop, Copy)]
-struct IFaultyTraitLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
+pub struct IFaultyTraitLibraryDispatcherSubPointers {
+    pub class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
 }
 impl IFaultyTraitLibraryDispatcherSubPointersImpl of starknet::storage::SubPointers<IFaultyTraitLibraryDispatcher> {
-type SubPointersType = IFaultyTraitLibraryDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitLibraryDispatcher>) -> IFaultyTraitLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = IFaultyTraitLibraryDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitLibraryDispatcher>) -> IFaultyTraitLibraryDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 IFaultyTraitLibraryDispatcherSubPointers {
            class_hash: class_hash_value,
@@ -2206,19 +2212,19 @@ type SubPointersType = IFaultyTraitLibraryDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableIFaultyTraitLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
-}
-impl MutableIFaultyTraitLibraryDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<IFaultyTraitLibraryDispatcher> {
-type SubPointersType = MutableIFaultyTraitLibraryDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitLibraryDispatcher>>) -> MutableIFaultyTraitLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct IFaultyTraitLibraryDispatcherSubPointersMut {
+    pub class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
+}
+impl IFaultyTraitLibraryDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<IFaultyTraitLibraryDispatcher> {
+    type SubPointersType = IFaultyTraitLibraryDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitLibraryDispatcher>>) -> IFaultyTraitLibraryDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableIFaultyTraitLibraryDispatcherSubPointers {
+                IFaultyTraitLibraryDispatcherSubPointersMut {
            class_hash: class_hash_value,
         }
     }
@@ -2268,17 +2274,17 @@ impl StoreIFaultyTraitSafeLibraryDispatcher of starknet::Store::<IFaultyTraitSaf
 }
 
 #[derive(Drop, Copy)]
-struct IFaultyTraitSafeLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
+pub struct IFaultyTraitSafeLibraryDispatcherSubPointers {
+    pub class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
 }
 impl IFaultyTraitSafeLibraryDispatcherSubPointersImpl of starknet::storage::SubPointers<IFaultyTraitSafeLibraryDispatcher> {
-type SubPointersType = IFaultyTraitSafeLibraryDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitSafeLibraryDispatcher>) -> IFaultyTraitSafeLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = IFaultyTraitSafeLibraryDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitSafeLibraryDispatcher>) -> IFaultyTraitSafeLibraryDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 IFaultyTraitSafeLibraryDispatcherSubPointers {
            class_hash: class_hash_value,
@@ -2286,19 +2292,19 @@ type SubPointersType = IFaultyTraitSafeLibraryDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableIFaultyTraitSafeLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
-}
-impl MutableIFaultyTraitSafeLibraryDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<IFaultyTraitSafeLibraryDispatcher> {
-type SubPointersType = MutableIFaultyTraitSafeLibraryDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitSafeLibraryDispatcher>>) -> MutableIFaultyTraitSafeLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct IFaultyTraitSafeLibraryDispatcherSubPointersMut {
+    pub class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
+}
+impl IFaultyTraitSafeLibraryDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<IFaultyTraitSafeLibraryDispatcher> {
+    type SubPointersType = IFaultyTraitSafeLibraryDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitSafeLibraryDispatcher>>) -> IFaultyTraitSafeLibraryDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableIFaultyTraitSafeLibraryDispatcherSubPointers {
+                IFaultyTraitSafeLibraryDispatcherSubPointersMut {
            class_hash: class_hash_value,
         }
     }
@@ -2348,17 +2354,17 @@ impl StoreIFaultyTraitSafeDispatcher of starknet::Store::<IFaultyTraitSafeDispat
 }
 
 #[derive(Drop, Copy)]
-struct IFaultyTraitSafeDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
+pub struct IFaultyTraitSafeDispatcherSubPointers {
+    pub contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
 }
 impl IFaultyTraitSafeDispatcherSubPointersImpl of starknet::storage::SubPointers<IFaultyTraitSafeDispatcher> {
-type SubPointersType = IFaultyTraitSafeDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitSafeDispatcher>) -> IFaultyTraitSafeDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = IFaultyTraitSafeDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitSafeDispatcher>) -> IFaultyTraitSafeDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 IFaultyTraitSafeDispatcherSubPointers {
            contract_address: contract_address_value,
@@ -2366,19 +2372,19 @@ type SubPointersType = IFaultyTraitSafeDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableIFaultyTraitSafeDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
-}
-impl MutableIFaultyTraitSafeDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<IFaultyTraitSafeDispatcher> {
-type SubPointersType = MutableIFaultyTraitSafeDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitSafeDispatcher>>) -> MutableIFaultyTraitSafeDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct IFaultyTraitSafeDispatcherSubPointersMut {
+    pub contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
+}
+impl IFaultyTraitSafeDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<IFaultyTraitSafeDispatcher> {
+    type SubPointersType = IFaultyTraitSafeDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitSafeDispatcher>>) -> IFaultyTraitSafeDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableIFaultyTraitSafeDispatcherSubPointers {
+                IFaultyTraitSafeDispatcherSubPointersMut {
            contract_address: contract_address_value,
         }
     }
@@ -2428,17 +2434,17 @@ impl StoreINominalTraitDispatcher of starknet::Store::<INominalTraitDispatcher>
 }
 
 #[derive(Drop, Copy)]
-struct INominalTraitDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
+pub struct INominalTraitDispatcherSubPointers {
+    pub contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
 }
 impl INominalTraitDispatcherSubPointersImpl of starknet::storage::SubPointers<INominalTraitDispatcher> {
-type SubPointersType = INominalTraitDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<INominalTraitDispatcher>) -> INominalTraitDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = INominalTraitDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<INominalTraitDispatcher>) -> INominalTraitDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 INominalTraitDispatcherSubPointers {
            contract_address: contract_address_value,
@@ -2446,19 +2452,19 @@ type SubPointersType = INominalTraitDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableINominalTraitDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
-}
-impl MutableINominalTraitDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<INominalTraitDispatcher> {
-type SubPointersType = MutableINominalTraitDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<INominalTraitDispatcher>>) -> MutableINominalTraitDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct INominalTraitDispatcherSubPointersMut {
+    pub contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
+}
+impl INominalTraitDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<INominalTraitDispatcher> {
+    type SubPointersType = INominalTraitDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<INominalTraitDispatcher>>) -> INominalTraitDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableINominalTraitDispatcherSubPointers {
+                INominalTraitDispatcherSubPointersMut {
            contract_address: contract_address_value,
         }
     }
@@ -2508,17 +2514,17 @@ impl StoreINominalTraitLibraryDispatcher of starknet::Store::<INominalTraitLibra
 }
 
 #[derive(Drop, Copy)]
-struct INominalTraitLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
+pub struct INominalTraitLibraryDispatcherSubPointers {
+    pub class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
 }
 impl INominalTraitLibraryDispatcherSubPointersImpl of starknet::storage::SubPointers<INominalTraitLibraryDispatcher> {
-type SubPointersType = INominalTraitLibraryDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<INominalTraitLibraryDispatcher>) -> INominalTraitLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = INominalTraitLibraryDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<INominalTraitLibraryDispatcher>) -> INominalTraitLibraryDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 INominalTraitLibraryDispatcherSubPointers {
            class_hash: class_hash_value,
@@ -2526,19 +2532,19 @@ type SubPointersType = INominalTraitLibraryDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableINominalTraitLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
-}
-impl MutableINominalTraitLibraryDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<INominalTraitLibraryDispatcher> {
-type SubPointersType = MutableINominalTraitLibraryDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<INominalTraitLibraryDispatcher>>) -> MutableINominalTraitLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct INominalTraitLibraryDispatcherSubPointersMut {
+    pub class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
+}
+impl INominalTraitLibraryDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<INominalTraitLibraryDispatcher> {
+    type SubPointersType = INominalTraitLibraryDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<INominalTraitLibraryDispatcher>>) -> INominalTraitLibraryDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableINominalTraitLibraryDispatcherSubPointers {
+                INominalTraitLibraryDispatcherSubPointersMut {
            class_hash: class_hash_value,
         }
     }
@@ -2588,17 +2594,17 @@ impl StoreINominalTraitSafeLibraryDispatcher of starknet::Store::<INominalTraitS
 }
 
 #[derive(Drop, Copy)]
-struct INominalTraitSafeLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
+pub struct INominalTraitSafeLibraryDispatcherSubPointers {
+    pub class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
 }
 impl INominalTraitSafeLibraryDispatcherSubPointersImpl of starknet::storage::SubPointers<INominalTraitSafeLibraryDispatcher> {
-type SubPointersType = INominalTraitSafeLibraryDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<INominalTraitSafeLibraryDispatcher>) -> INominalTraitSafeLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = INominalTraitSafeLibraryDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<INominalTraitSafeLibraryDispatcher>) -> INominalTraitSafeLibraryDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 INominalTraitSafeLibraryDispatcherSubPointers {
            class_hash: class_hash_value,
@@ -2606,19 +2612,19 @@ type SubPointersType = INominalTraitSafeLibraryDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableINominalTraitSafeLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
-}
-impl MutableINominalTraitSafeLibraryDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<INominalTraitSafeLibraryDispatcher> {
-type SubPointersType = MutableINominalTraitSafeLibraryDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<INominalTraitSafeLibraryDispatcher>>) -> MutableINominalTraitSafeLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct INominalTraitSafeLibraryDispatcherSubPointersMut {
+    pub class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
+}
+impl INominalTraitSafeLibraryDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<INominalTraitSafeLibraryDispatcher> {
+    type SubPointersType = INominalTraitSafeLibraryDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<INominalTraitSafeLibraryDispatcher>>) -> INominalTraitSafeLibraryDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableINominalTraitSafeLibraryDispatcherSubPointers {
+                INominalTraitSafeLibraryDispatcherSubPointersMut {
            class_hash: class_hash_value,
         }
     }
@@ -2668,17 +2674,17 @@ impl StoreINominalTraitSafeDispatcher of starknet::Store::<INominalTraitSafeDisp
 }
 
 #[derive(Drop, Copy)]
-struct INominalTraitSafeDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
+pub struct INominalTraitSafeDispatcherSubPointers {
+    pub contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
 }
 impl INominalTraitSafeDispatcherSubPointersImpl of starknet::storage::SubPointers<INominalTraitSafeDispatcher> {
-type SubPointersType = INominalTraitSafeDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<INominalTraitSafeDispatcher>) -> INominalTraitSafeDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = INominalTraitSafeDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<INominalTraitSafeDispatcher>) -> INominalTraitSafeDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 INominalTraitSafeDispatcherSubPointers {
            contract_address: contract_address_value,
@@ -2686,19 +2692,19 @@ type SubPointersType = INominalTraitSafeDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableINominalTraitSafeDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
-}
-impl MutableINominalTraitSafeDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<INominalTraitSafeDispatcher> {
-type SubPointersType = MutableINominalTraitSafeDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<INominalTraitSafeDispatcher>>) -> MutableINominalTraitSafeDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct INominalTraitSafeDispatcherSubPointersMut {
+    pub contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
+}
+impl INominalTraitSafeDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<INominalTraitSafeDispatcher> {
+    type SubPointersType = INominalTraitSafeDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<INominalTraitSafeDispatcher>>) -> INominalTraitSafeDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableINominalTraitSafeDispatcherSubPointers {
+                INominalTraitSafeDispatcherSubPointersMut {
            contract_address: contract_address_value,
         }
     }
@@ -2748,17 +2754,17 @@ impl StoreIFaultyTraitDispatcher of starknet::Store::<IFaultyTraitDispatcher> {
 }
 
 #[derive(Drop, Copy)]
-struct IFaultyTraitDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
+pub struct IFaultyTraitDispatcherSubPointers {
+    pub contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
 }
 impl IFaultyTraitDispatcherSubPointersImpl of starknet::storage::SubPointers<IFaultyTraitDispatcher> {
-type SubPointersType = IFaultyTraitDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitDispatcher>) -> IFaultyTraitDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = IFaultyTraitDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitDispatcher>) -> IFaultyTraitDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 IFaultyTraitDispatcherSubPointers {
            contract_address: contract_address_value,
@@ -2766,19 +2772,19 @@ type SubPointersType = IFaultyTraitDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableIFaultyTraitDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
-}
-impl MutableIFaultyTraitDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<IFaultyTraitDispatcher> {
-type SubPointersType = MutableIFaultyTraitDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitDispatcher>>) -> MutableIFaultyTraitDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct IFaultyTraitDispatcherSubPointersMut {
+    pub contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
+}
+impl IFaultyTraitDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<IFaultyTraitDispatcher> {
+    type SubPointersType = IFaultyTraitDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitDispatcher>>) -> IFaultyTraitDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableIFaultyTraitDispatcherSubPointers {
+                IFaultyTraitDispatcherSubPointersMut {
            contract_address: contract_address_value,
         }
     }
@@ -2828,17 +2834,17 @@ impl StoreIFaultyTraitLibraryDispatcher of starknet::Store::<IFaultyTraitLibrary
 }
 
 #[derive(Drop, Copy)]
-struct IFaultyTraitLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
+pub struct IFaultyTraitLibraryDispatcherSubPointers {
+    pub class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
 }
 impl IFaultyTraitLibraryDispatcherSubPointersImpl of starknet::storage::SubPointers<IFaultyTraitLibraryDispatcher> {
-type SubPointersType = IFaultyTraitLibraryDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitLibraryDispatcher>) -> IFaultyTraitLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = IFaultyTraitLibraryDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitLibraryDispatcher>) -> IFaultyTraitLibraryDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 IFaultyTraitLibraryDispatcherSubPointers {
            class_hash: class_hash_value,
@@ -2846,19 +2852,19 @@ type SubPointersType = IFaultyTraitLibraryDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableIFaultyTraitLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
-}
-impl MutableIFaultyTraitLibraryDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<IFaultyTraitLibraryDispatcher> {
-type SubPointersType = MutableIFaultyTraitLibraryDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitLibraryDispatcher>>) -> MutableIFaultyTraitLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct IFaultyTraitLibraryDispatcherSubPointersMut {
+    pub class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
+}
+impl IFaultyTraitLibraryDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<IFaultyTraitLibraryDispatcher> {
+    type SubPointersType = IFaultyTraitLibraryDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitLibraryDispatcher>>) -> IFaultyTraitLibraryDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableIFaultyTraitLibraryDispatcherSubPointers {
+                IFaultyTraitLibraryDispatcherSubPointersMut {
            class_hash: class_hash_value,
         }
     }
@@ -2908,17 +2914,17 @@ impl StoreIFaultyTraitSafeLibraryDispatcher of starknet::Store::<IFaultyTraitSaf
 }
 
 #[derive(Drop, Copy)]
-struct IFaultyTraitSafeLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
+pub struct IFaultyTraitSafeLibraryDispatcherSubPointers {
+    pub class_hash: starknet::storage::StoragePointer<starknet::ClassHash>,
 }
 impl IFaultyTraitSafeLibraryDispatcherSubPointersImpl of starknet::storage::SubPointers<IFaultyTraitSafeLibraryDispatcher> {
-type SubPointersType = IFaultyTraitSafeLibraryDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitSafeLibraryDispatcher>) -> IFaultyTraitSafeLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = IFaultyTraitSafeLibraryDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitSafeLibraryDispatcher>) -> IFaultyTraitSafeLibraryDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 IFaultyTraitSafeLibraryDispatcherSubPointers {
            class_hash: class_hash_value,
@@ -2926,19 +2932,19 @@ type SubPointersType = IFaultyTraitSafeLibraryDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableIFaultyTraitSafeLibraryDispatcherSubPointers {
-    class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
-}
-impl MutableIFaultyTraitSafeLibraryDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<IFaultyTraitSafeLibraryDispatcher> {
-type SubPointersType = MutableIFaultyTraitSafeLibraryDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitSafeLibraryDispatcher>>) -> MutableIFaultyTraitSafeLibraryDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct IFaultyTraitSafeLibraryDispatcherSubPointersMut {
+    pub class_hash: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ClassHash>>,
+}
+impl IFaultyTraitSafeLibraryDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<IFaultyTraitSafeLibraryDispatcher> {
+    type SubPointersType = IFaultyTraitSafeLibraryDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitSafeLibraryDispatcher>>) -> IFaultyTraitSafeLibraryDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let class_hash_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableIFaultyTraitSafeLibraryDispatcherSubPointers {
+                IFaultyTraitSafeLibraryDispatcherSubPointersMut {
            class_hash: class_hash_value,
         }
     }
@@ -2988,17 +2994,17 @@ impl StoreIFaultyTraitSafeDispatcher of starknet::Store::<IFaultyTraitSafeDispat
 }
 
 #[derive(Drop, Copy)]
-struct IFaultyTraitSafeDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
+pub struct IFaultyTraitSafeDispatcherSubPointers {
+    pub contract_address: starknet::storage::StoragePointer<starknet::ContractAddress>,
 }
 impl IFaultyTraitSafeDispatcherSubPointersImpl of starknet::storage::SubPointers<IFaultyTraitSafeDispatcher> {
-type SubPointersType = IFaultyTraitSafeDispatcherSubPointers;
-   fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitSafeDispatcher>) -> IFaultyTraitSafeDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+    type SubPointersType = IFaultyTraitSafeDispatcherSubPointers;
+    fn sub_pointers(self: starknet::storage::StoragePointer<IFaultyTraitSafeDispatcher>) -> IFaultyTraitSafeDispatcherSubPointers {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
                 IFaultyTraitSafeDispatcherSubPointers {
            contract_address: contract_address_value,
@@ -3006,84 +3012,84 @@ type SubPointersType = IFaultyTraitSafeDispatcherSubPointers;
     }
 }
 #[derive(Drop, Copy)]
-struct MutableIFaultyTraitSafeDispatcherSubPointers {
-    contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
-}
-impl MutableIFaultyTraitSafeDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<IFaultyTraitSafeDispatcher> {
-type SubPointersType = MutableIFaultyTraitSafeDispatcherSubPointers;
-   fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitSafeDispatcher>>) -> MutableIFaultyTraitSafeDispatcherSubPointers {
-               let base_address = self.address;
-        let mut current_offset = self.offset;
+pub struct IFaultyTraitSafeDispatcherSubPointersMut {
+    pub contract_address: starknet::storage::StoragePointer<starknet::storage::Mutable::<starknet::ContractAddress>>,
+}
+impl IFaultyTraitSafeDispatcherSubPointersMutImpl of starknet::storage::SubPointersMut<IFaultyTraitSafeDispatcher> {
+    type SubPointersType = IFaultyTraitSafeDispatcherSubPointersMut;
+    fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<IFaultyTraitSafeDispatcher>>) -> IFaultyTraitSafeDispatcherSubPointersMut {
+        let base_address = self.__storage_pointer_address__;
+        let mut current_offset = self.__storage_pointer_offset__;
         let contract_address_value = starknet::storage::StoragePointer {
-            address: base_address,
-            offset: current_offset,
+            __storage_pointer_address__: base_address,
+            __storage_pointer_offset__: current_offset,
         };
-                MutableIFaultyTraitSafeDispatcherSubPointers {
+                IFaultyTraitSafeDispatcherSubPointersMut {
            contract_address: contract_address_value,
         }
     }
 }
 impl IEmptyTraitDispatcherSubPointersDrop of core::traits::Drop::<IEmptyTraitDispatcherSubPointers>;
 impl IEmptyTraitDispatcherSubPointersCopy of core::traits::Copy::<IEmptyTraitDispatcherSubPointers>;
-impl MutableIEmptyTraitDispatcherSubPointersDrop of core::traits::Drop::<MutableIEmptyTraitDispatcherSubPointers>;
-impl MutableIEmptyTraitDispatcherSubPointersCopy of core::traits::Copy::<MutableIEmptyTraitDispatcherSubPointers>;
+impl IEmptyTraitDispatcherSubPointersMutDrop of core::traits::Drop::<IEmptyTraitDispatcherSubPointersMut>;
+impl IEmptyTraitDispatcherSubPointersMutCopy of core::traits::Copy::<IEmptyTraitDispatcherSubPointersMut>;
 impl IEmptyTraitLibraryDispatcherSubPointersDrop of core::traits::Drop::<IEmptyTraitLibraryDispatcherSubPointers>;
 impl IEmptyTraitLibraryDispatcherSubPointersCopy of core::traits::Copy::<IEmptyTraitLibraryDispatcherSubPointers>;
-impl MutableIEmptyTraitLibraryDispatcherSubPointersDrop of core::traits::Drop::<MutableIEmptyTraitLibraryDispatcherSubPointers>;
-impl MutableIEmptyTraitLibraryDispatcherSubPointersCopy of core::traits::Copy::<MutableIEmptyTraitLibraryDispatcherSubPointers>;
+impl IEmptyTraitLibraryDispatcherSubPointersMutDrop of core::traits::Drop::<IEmptyTraitLibraryDispatcherSubPointersMut>;
+impl IEmptyTraitLibraryDispatcherSubPointersMutCopy of core::traits::Copy::<IEmptyTraitLibraryDispatcherSubPointersMut>;
 impl IEmptyTraitSafeLibraryDispatcherSubPointersDrop of core::traits::Drop::<IEmptyTraitSafeLibraryDispatcherSubPointers>;
 impl IEmptyTraitSafeLibraryDispatcherSubPointersCopy of core::traits::Copy::<IEmptyTraitSafeLibraryDispatcherSubPointers>;
-impl MutableIEmptyTraitSafeLibraryDispatcherSubPointersDrop of core::traits::Drop::<MutableIEmptyTraitSafeLibraryDispatcherSubPointers>;
-impl MutableIEmptyTraitSafeLibraryDispatcherSubPointersCopy of core::traits::Copy::<MutableIEmptyTraitSafeLibraryDispatcherSubPointers>;
+impl IEmptyTraitSafeLibraryDispatcherSubPointersMutDrop of core::traits::Drop::<IEmptyTraitSafeLibraryDispatcherSubPointersMut>;
+impl IEmptyTraitSafeLibraryDispatcherSubPointersMutCopy of core::traits::Copy::<IEmptyTraitSafeLibraryDispatcherSubPointersMut>;
 impl IEmptyTraitSafeDispatcherSubPointersDrop of core::traits::Drop::<IEmptyTraitSafeDispatcherSubPointers>;
 impl IEmptyTraitSafeDispatcherSubPointersCopy of core::traits::Copy::<IEmptyTraitSafeDispatcherSubPointers>;
-impl MutableIEmptyTraitSafeDispatcherSubPointersDrop of core::traits::Drop::<MutableIEmptyTraitSafeDispatcherSubPointers>;
-impl MutableIEmptyTraitSafeDispatcherSubPointersCopy of core::traits::Copy::<MutableIEmptyTraitSafeDispatcherSubPointers>;
+impl IEmptyTraitSafeDispatcherSubPointersMutDrop of core::traits::Drop::<IEmptyTraitSafeDispatcherSubPointersMut>;
+impl IEmptyTraitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<IEmptyTraitSafeDispatcherSubPointersMut>;
 impl IFaultyTraitDispatcherSubPointersDrop of core::traits::Drop::<IFaultyTraitDispatcherSubPointers>;
 impl IFaultyTraitDispatcherSubPointersCopy of core::traits::Copy::<IFaultyTraitDispatcherSubPointers>;
-impl MutableIFaultyTraitDispatcherSubPointersDrop of core::traits::Drop::<MutableIFaultyTraitDispatcherSubPointers>;
-impl MutableIFaultyTraitDispatcherSubPointersCopy of core::traits::Copy::<MutableIFaultyTraitDispatcherSubPointers>;
+impl IFaultyTraitDispatcherSubPointersMutDrop of core::traits::Drop::<IFaultyTraitDispatcherSubPointersMut>;
+impl IFaultyTraitDispatcherSubPointersMutCopy of core::traits::Copy::<IFaultyTraitDispatcherSubPointersMut>;
 impl IFaultyTraitLibraryDispatcherSubPointersDrop of core::traits::Drop::<IFaultyTraitLibraryDispatcherSubPointers>;
 impl IFaultyTraitLibraryDispatcherSubPointersCopy of core::traits::Copy::<IFaultyTraitLibraryDispatcherSubPointers>;
-impl MutableIFaultyTraitLibraryDispatcherSubPointersDrop of core::traits::Drop::<MutableIFaultyTraitLibraryDispatcherSubPointers>;
-impl MutableIFaultyTraitLibraryDispatcherSubPointersCopy of core::traits::Copy::<MutableIFaultyTraitLibraryDispatcherSubPointers>;
+impl IFaultyTraitLibraryDispatcherSubPointersMutDrop of core::traits::Drop::<IFaultyTraitLibraryDispatcherSubPointersMut>;
+impl IFaultyTraitLibraryDispatcherSubPointersMutCopy of core::traits::Copy::<IFaultyTraitLibraryDispatcherSubPointersMut>;
 impl IFaultyTraitSafeLibraryDispatcherSubPointersDrop of core::traits::Drop::<IFaultyTraitSafeLibraryDispatcherSubPointers>;
 impl IFaultyTraitSafeLibraryDispatcherSubPointersCopy of core::traits::Copy::<IFaultyTraitSafeLibraryDispatcherSubPointers>;
-impl MutableIFaultyTraitSafeLibraryDispatcherSubPointersDrop of core::traits::Drop::<MutableIFaultyTraitSafeLibraryDispatcherSubPointers>;
-impl MutableIFaultyTraitSafeLibraryDispatcherSubPointersCopy of core::traits::Copy::<MutableIFaultyTraitSafeLibraryDispatcherSubPointers>;
+impl IFaultyTraitSafeLibraryDispatcherSubPointersMutDrop of core::traits::Drop::<IFaultyTraitSafeLibraryDispatcherSubPointersMut>;
+impl IFaultyTraitSafeLibraryDispatcherSubPointersMutCopy of core::traits::Copy::<IFaultyTraitSafeLibraryDispatcherSubPointersMut>;
 impl IFaultyTraitSafeDispatcherSubPointersDrop of core::traits::Drop::<IFaultyTraitSafeDispatcherSubPointers>;
 impl IFaultyTraitSafeDispatcherSubPointersCopy of core::traits::Copy::<IFaultyTraitSafeDispatcherSubPointers>;
-impl MutableIFaultyTraitSafeDispatcherSubPointersDrop of core::traits::Drop::<MutableIFaultyTraitSafeDispatcherSubPointers>;
-impl MutableIFaultyTraitSafeDispatcherSubPointersCopy of core::traits::Copy::<MutableIFaultyTraitSafeDispatcherSubPointers>;
+impl IFaultyTraitSafeDispatcherSubPointersMutDrop of core::traits::Drop::<IFaultyTraitSafeDispatcherSubPointersMut>;
+impl IFaultyTraitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<IFaultyTraitSafeDispatcherSubPointersMut>;
 impl INominalTraitDispatcherSubPointersDrop of core::traits::Drop::<INominalTraitDispatcherSubPointers>;
 impl INominalTraitDispatcherSubPointersCopy of core::traits::Copy::<INominalTraitDispatcherSubPointers>;
-impl MutableINominalTraitDispatcherSubPointersDrop of core::traits::Drop::<MutableINominalTraitDispatcherSubPointers>;
-impl MutableINominalTraitDispatcherSubPointersCopy of core::traits::Copy::<MutableINominalTraitDispatcherSubPointers>;
+impl INominalTraitDispatcherSubPointersMutDrop of core::traits::Drop::<INominalTraitDispatcherSubPointersMut>;
+impl INominalTraitDispatcherSubPointersMutCopy of core::traits::Copy::<INominalTraitDispatcherSubPointersMut>;
 impl INominalTraitLibraryDispatcherSubPointersDrop of core::traits::Drop::<INominalTraitLibraryDispatcherSubPointers>;
 impl INominalTraitLibraryDispatcherSubPointersCopy of core::traits::Copy::<INominalTraitLibraryDispatcherSubPointers>;
-impl MutableINominalTraitLibraryDispatcherSubPointersDrop of core::traits::Drop::<MutableINominalTraitLibraryDispatcherSubPointers>;
-impl MutableINominalTraitLibraryDispatcherSubPointersCopy of core::traits::Copy::<MutableINominalTraitLibraryDispatcherSubPointers>;
+impl INominalTraitLibraryDispatcherSubPointersMutDrop of core::traits::Drop::<INominalTraitLibraryDispatcherSubPointersMut>;
+impl INominalTraitLibraryDispatcherSubPointersMutCopy of core::traits::Copy::<INominalTraitLibraryDispatcherSubPointersMut>;
 impl INominalTraitSafeLibraryDispatcherSubPointersDrop of core::traits::Drop::<INominalTraitSafeLibraryDispatcherSubPointers>;
 impl INominalTraitSafeLibraryDispatcherSubPointersCopy of core::traits::Copy::<INominalTraitSafeLibraryDispatcherSubPointers>;
-impl MutableINominalTraitSafeLibraryDispatcherSubPointersDrop of core::traits::Drop::<MutableINominalTraitSafeLibraryDispatcherSubPointers>;
-impl MutableINominalTraitSafeLibraryDispatcherSubPointersCopy of core::traits::Copy::<MutableINominalTraitSafeLibraryDispatcherSubPointers>;
+impl INominalTraitSafeLibraryDispatcherSubPointersMutDrop of core::traits::Drop::<INominalTraitSafeLibraryDispatcherSubPointersMut>;
+impl INominalTraitSafeLibraryDispatcherSubPointersMutCopy of core::traits::Copy::<INominalTraitSafeLibraryDispatcherSubPointersMut>;
 impl INominalTraitSafeDispatcherSubPointersDrop of core::traits::Drop::<INominalTraitSafeDispatcherSubPointers>;
 impl INominalTraitSafeDispatcherSubPointersCopy of core::traits::Copy::<INominalTraitSafeDispatcherSubPointers>;
-impl MutableINominalTraitSafeDispatcherSubPointersDrop of core::traits::Drop::<MutableINominalTraitSafeDispatcherSubPointers>;
-impl MutableINominalTraitSafeDispatcherSubPointersCopy of core::traits::Copy::<MutableINominalTraitSafeDispatcherSubPointers>;
+impl INominalTraitSafeDispatcherSubPointersMutDrop of core::traits::Drop::<INominalTraitSafeDispatcherSubPointersMut>;
+impl INominalTraitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<INominalTraitSafeDispatcherSubPointersMut>;
 impl IFaultyTraitDispatcherSubPointersDrop of core::traits::Drop::<IFaultyTraitDispatcherSubPointers>;
 impl IFaultyTraitDispatcherSubPointersCopy of core::traits::Copy::<IFaultyTraitDispatcherSubPointers>;
-impl MutableIFaultyTraitDispatcherSubPointersDrop of core::traits::Drop::<MutableIFaultyTraitDispatcherSubPointers>;
-impl MutableIFaultyTraitDispatcherSubPointersCopy of core::traits::Copy::<MutableIFaultyTraitDispatcherSubPointers>;
+impl IFaultyTraitDispatcherSubPointersMutDrop of core::traits::Drop::<IFaultyTraitDispatcherSubPointersMut>;
+impl IFaultyTraitDispatcherSubPointersMutCopy of core::traits::Copy::<IFaultyTraitDispatcherSubPointersMut>;
 impl IFaultyTraitLibraryDispatcherSubPointersDrop of core::traits::Drop::<IFaultyTraitLibraryDispatcherSubPointers>;
 impl IFaultyTraitLibraryDispatcherSubPointersCopy of core::traits::Copy::<IFaultyTraitLibraryDispatcherSubPointers>;
-impl MutableIFaultyTraitLibraryDispatcherSubPointersDrop of core::traits::Drop::<MutableIFaultyTraitLibraryDispatcherSubPointers>;
-impl MutableIFaultyTraitLibraryDispatcherSubPointersCopy of core::traits::Copy::<MutableIFaultyTraitLibraryDispatcherSubPointers>;
+impl IFaultyTraitLibraryDispatcherSubPointersMutDrop of core::traits::Drop::<IFaultyTraitLibraryDispatcherSubPointersMut>;
+impl IFaultyTraitLibraryDispatcherSubPointersMutCopy of core::traits::Copy::<IFaultyTraitLibraryDispatcherSubPointersMut>;
 impl IFaultyTraitSafeLibraryDispatcherSubPointersDrop of core::traits::Drop::<IFaultyTraitSafeLibraryDispatcherSubPointers>;
 impl IFaultyTraitSafeLibraryDispatcherSubPointersCopy of core::traits::Copy::<IFaultyTraitSafeLibraryDispatcherSubPointers>;
-impl MutableIFaultyTraitSafeLibraryDispatcherSubPointersDrop of core::traits::Drop::<MutableIFaultyTraitSafeLibraryDispatcherSubPointers>;
-impl MutableIFaultyTraitSafeLibraryDispatcherSubPointersCopy of core::traits::Copy::<MutableIFaultyTraitSafeLibraryDispatcherSubPointers>;
+impl IFaultyTraitSafeLibraryDispatcherSubPointersMutDrop of core::traits::Drop::<IFaultyTraitSafeLibraryDispatcherSubPointersMut>;
+impl IFaultyTraitSafeLibraryDispatcherSubPointersMutCopy of core::traits::Copy::<IFaultyTraitSafeLibraryDispatcherSubPointersMut>;
 impl IFaultyTraitSafeDispatcherSubPointersDrop of core::traits::Drop::<IFaultyTraitSafeDispatcherSubPointers>;
 impl IFaultyTraitSafeDispatcherSubPointersCopy of core::traits::Copy::<IFaultyTraitSafeDispatcherSubPointers>;
-impl MutableIFaultyTraitSafeDispatcherSubPointersDrop of core::traits::Drop::<MutableIFaultyTraitSafeDispatcherSubPointers>;
-impl MutableIFaultyTraitSafeDispatcherSubPointersCopy of core::traits::Copy::<MutableIFaultyTraitSafeDispatcherSubPointers>;
+impl IFaultyTraitSafeDispatcherSubPointersMutDrop of core::traits::Drop::<IFaultyTraitSafeDispatcherSubPointersMut>;
+impl IFaultyTraitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<IFaultyTraitSafeDispatcherSubPointersMut>;
diff --git a/crates/dojo-lang/src/print.rs b/crates/dojo-lang/src/print.rs
index 168adb79d7..999adf2622 100644
--- a/crates/dojo-lang/src/print.rs
+++ b/crates/dojo-lang/src/print.rs
@@ -8,6 +8,7 @@ use cairo_lang_utils::unordered_hash_map::UnorderedHashMap;
 /// Parameters:
 /// * db: The semantic database.
 /// * struct_ast: The AST of the model struct.
+///
 /// Returns:
 /// * A RewriteNode containing the generated code.
 pub fn handle_print_struct(db: &dyn SyntaxGroup, struct_ast: ItemStruct) -> RewriteNode {
@@ -47,6 +48,7 @@ impl $type_name$StructPrintImpl of core::debug::PrintTrait<$type_name$> {
 /// Parameters:
 /// * db: The semantic database.
 /// * enum_ast: The AST of the model enum.
+///
 /// Returns:
 /// * A RewriteNode containing the generated code.
 pub fn handle_print_enum(db: &dyn SyntaxGroup, enum_ast: ItemEnum) -> RewriteNode {
diff --git a/crates/dojo-world/abigen/src/main.rs b/crates/dojo-world/abigen/src/main.rs
index da004fad1c..ff73010dfd 100644
--- a/crates/dojo-world/abigen/src/main.rs
+++ b/crates/dojo-world/abigen/src/main.rs
@@ -104,13 +104,13 @@ fn compile_dojo_core() {
         file,
         r#"
 [package]
-cairo-version = "2.7.0-rc.3"
+cairo-version = "2.7.0"
 edition = "2024_07"
 name = "dojo"
-version = "0.7.3"
+version = "1.0.0-alpha.4"
 
 [dependencies]
-starknet = "2.7.0-rc.3"
+starknet = "2.7.0"
 
 [[target.starknet-contract]]
 sierra = true
diff --git a/crates/katana/storage/db/src/abstraction/cursor.rs b/crates/katana/storage/db/src/abstraction/cursor.rs
index 252d4a9d30..185e1fecfc 100644
--- a/crates/katana/storage/db/src/abstraction/cursor.rs
+++ b/crates/katana/storage/db/src/abstraction/cursor.rs
@@ -81,8 +81,7 @@ pub trait DbDupSortCursor<T: DupSort>: DbCursor<T> {
     /// - Some(key), Some(subkey): a `key` item whose data is >= than `subkey`
     /// - Some(key), None: first item of a specified `key`
     /// - None, Some(subkey): like first case, but in the first key
-    /// - None, None: first item in the table
-    /// of a DUPSORT table.
+    /// - None, None: first item in the table of a DUPSORT table.
     fn walk_dup(
         &mut self,
         key: Option<T::Key>,
diff --git a/crates/saya/core/src/lib.rs b/crates/saya/core/src/lib.rs
index 408294650c..1b25b579e3 100644
--- a/crates/saya/core/src/lib.rs
+++ b/crates/saya/core/src/lib.rs
@@ -274,7 +274,7 @@ impl Saya {
     /// * `prove_scheduler` - A parallel prove scheduler.
     /// * `block_number` - The block number.
     /// * `block_info` - The block to process, along with the state roots of the previous block and
-    /// the genesis block.
+    ///   the genesis block.
     fn process_block(
         &mut self,
         prove_scheduler: &mut Scheduler,
diff --git a/crates/sozo/ops/src/utils.rs b/crates/sozo/ops/src/utils.rs
index 83bdf458a2..87000533ce 100644
--- a/crates/sozo/ops/src/utils.rs
+++ b/crates/sozo/ops/src/utils.rs
@@ -115,7 +115,7 @@ where
 /// # Arguments
 ///
 /// * `block_str` - a string representing a block ID. It could be a
-/// block hash starting with 0x, a block number, 'pending' or 'latest'.
+///   block hash starting with 0x, a block number, 'pending' or 'latest'.
 ///
 /// # Returns
 ///
diff --git a/crates/torii/types-test/Scarb.lock b/crates/torii/types-test/Scarb.lock
index ba40a5e915..dc899a1de1 100644
--- a/crates/torii/types-test/Scarb.lock
+++ b/crates/torii/types-test/Scarb.lock
@@ -3,7 +3,7 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "0.7.3"
+version = "1.0.0-alpha.4"
 dependencies = [
  "dojo_plugin",
 ]
@@ -15,7 +15,7 @@ source = "git+https://github.com/dojoengine/dojo?rev=71b1f1a4#71b1f1a467534cbeeb
 
 [[package]]
 name = "types_test"
-version = "0.7.3"
+version = "1.0.0-alpha.4"
 dependencies = [
  "dojo",
 ]
diff --git a/examples/spawn-and-move/Scarb.lock b/examples/spawn-and-move/Scarb.lock
index 5b6d7916bc..a5f10a3aae 100644
--- a/examples/spawn-and-move/Scarb.lock
+++ b/examples/spawn-and-move/Scarb.lock
@@ -17,14 +17,14 @@ dependencies = [
 
 [[package]]
 name = "dojo"
-version = "0.7.3"
+version = "1.0.0-alpha.4"
 dependencies = [
  "dojo_plugin",
 ]
 
 [[package]]
 name = "dojo_examples"
-version = "0.7.3"
+version = "1.0.0-alpha.4"
 dependencies = [
  "armory",
  "bestiary",
diff --git a/examples/spawn-and-move/Scarb.toml b/examples/spawn-and-move/Scarb.toml
index 9a6a983922..e91c6eab41 100644
--- a/examples/spawn-and-move/Scarb.toml
+++ b/examples/spawn-and-move/Scarb.toml
@@ -40,7 +40,7 @@ rpc_url = "http://localhost:5050/"
 # Default account for katana with seed = 0
 account_address = "0x6162896d1d7ab204c7ccac6dd5f8e9e7c25ecd5ae4fcb4ad32e57786bb46e03"
 private_key = "0x1800000000300000180000000000030000000000003006001800006600"
-world_address = "0x25e74888e786245ec7aa93d846b2cc9e4b49a5244209860bbf4b384f654521b"
+world_address = "0x2f6f0512832a8820173edb8e1adac28b7edc78bb3b6f038614adf4377b694c5"
 
 [profile.release.tool.dojo]
 # for more info on how `merge-strategy` works see:
diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml
index d6647ceeca..73cca5ec1b 100644
--- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml
+++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x2a8de224c28cae3049e23b352e7fce6f26cc99884331e5f2a6aea261398a27a"
-original_class_hash = "0x2a8de224c28cae3049e23b352e7fce6f26cc99884331e5f2a6aea261398a27a"
+class_hash = "0xc0a5037a6fdc0b374b270ca5e9f3bd76200d73d01f409749b7006b3cd6c03d"
+original_class_hash = "0xc0a5037a6fdc0b374b270ca5e9f3bd76200d73d01f409749b7006b3cd6c03d"
 base_class_hash = "0x0"
 abi = "manifests/dev/base/abis/contracts/dojo_examples-actions-40b6994c.json"
 reads = []
diff --git a/examples/spawn-and-move/manifests/dev/base/dojo-world.toml b/examples/spawn-and-move/manifests/dev/base/dojo-world.toml
index 59d4719031..5ebf245a91 100644
--- a/examples/spawn-and-move/manifests/dev/base/dojo-world.toml
+++ b/examples/spawn-and-move/manifests/dev/base/dojo-world.toml
@@ -1,6 +1,6 @@
 kind = "Class"
-class_hash = "0x2178527e9556d1aa21d3c2961d28f9114fcfed81b4c3674ed591c50ce46cc9d"
-original_class_hash = "0x2178527e9556d1aa21d3c2961d28f9114fcfed81b4c3674ed591c50ce46cc9d"
+class_hash = "0x14287624e97e0312d4e680e19071efce983810e909b32afc54cd9c8031f4c1c"
+original_class_hash = "0x14287624e97e0312d4e680e19071efce983810e909b32afc54cd9c8031f4c1c"
 abi = "manifests/dev/base/abis/dojo-world.json"
 tag = "dojo-world"
 manifest_name = "dojo-world"
diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moves-2e2accba.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moves-2e2accba.toml
index 9396b8ee6f..2007e33243 100644
--- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moves-2e2accba.toml
+++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moves-2e2accba.toml
@@ -1,6 +1,6 @@
 kind = "DojoModel"
-class_hash = "0x61fa996f7cf8412bb5aca7d4bd4fd9eca806a92e5007e87d23f638b6774ed40"
-original_class_hash = "0x61fa996f7cf8412bb5aca7d4bd4fd9eca806a92e5007e87d23f638b6774ed40"
+class_hash = "0x2bfdf50f9ec0670b52065947e6ce2e1ebb39d54d19da1b65411b6d58bb04e79"
+original_class_hash = "0x2bfdf50f9ec0670b52065947e6ce2e1ebb39d54d19da1b65411b6d58bb04e79"
 abi = "manifests/dev/base/abis/models/dojo_examples-Moves-2e2accba.json"
 tag = "dojo_examples-Moves"
 manifest_name = "dojo_examples-Moves-2e2accba"
diff --git a/examples/spawn-and-move/manifests/dev/deployment/manifest.json b/examples/spawn-and-move/manifests/dev/deployment/manifest.json
index c7d42bb7df..a1672d6fc0 100644
--- a/examples/spawn-and-move/manifests/dev/deployment/manifest.json
+++ b/examples/spawn-and-move/manifests/dev/deployment/manifest.json
@@ -1,8 +1,8 @@
 {
   "world": {
     "kind": "WorldContract",
-    "class_hash": "0x2178527e9556d1aa21d3c2961d28f9114fcfed81b4c3674ed591c50ce46cc9d",
-    "original_class_hash": "0x2178527e9556d1aa21d3c2961d28f9114fcfed81b4c3674ed591c50ce46cc9d",
+    "class_hash": "0x14287624e97e0312d4e680e19071efce983810e909b32afc54cd9c8031f4c1c",
+    "original_class_hash": "0x14287624e97e0312d4e680e19071efce983810e909b32afc54cd9c8031f4c1c",
     "abi": [
       {
         "type": "impl",
@@ -1221,8 +1221,8 @@
         ]
       }
     ],
-    "address": "0x25e74888e786245ec7aa93d846b2cc9e4b49a5244209860bbf4b384f654521b",
-    "transaction_hash": "0x1606f5a86180d90027d33915cf0d62e117f778f8837df3c1375af3d3bc2951e",
+    "address": "0x2f6f0512832a8820173edb8e1adac28b7edc78bb3b6f038614adf4377b694c5",
+    "transaction_hash": "0x22c5e928ee07543e0eef5aae78ded9902d7d8647f76d46d743be2f2661ebab7",
     "block_number": 3,
     "seed": "dojo_examples",
     "metadata": {
@@ -1242,9 +1242,9 @@
   "contracts": [
     {
       "kind": "DojoContract",
-      "address": "0x24d926d75cd84104c3bd24f0f79e95c273d6a99ed449f3c8b83114857020332",
-      "class_hash": "0x2a8de224c28cae3049e23b352e7fce6f26cc99884331e5f2a6aea261398a27a",
-      "original_class_hash": "0x2a8de224c28cae3049e23b352e7fce6f26cc99884331e5f2a6aea261398a27a",
+      "address": "0x66221f204a50d51e28d03bc1578bc1845371cd0f0932666b507cd9721c183ec",
+      "class_hash": "0xc0a5037a6fdc0b374b270ca5e9f3bd76200d73d01f409749b7006b3cd6c03d",
+      "original_class_hash": "0xc0a5037a6fdc0b374b270ca5e9f3bd76200d73d01f409749b7006b3cd6c03d",
       "base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",
       "abi": [
         {
@@ -1691,7 +1691,7 @@
     },
     {
       "kind": "DojoContract",
-      "address": "0x31a348061c348eb84d7d9f1658244432170822cdb1a97a586805b565c168bcf",
+      "address": "0x71e9522f412f3458a3508d0449f8f3a4e1662da382c86393b3abb193d2968b5",
       "class_hash": "0x45ad5a298db270a9c3ee439b7a7a008e3219b70937cfaa144589866442f3908",
       "original_class_hash": "0x45ad5a298db270a9c3ee439b7a7a008e3219b70937cfaa144589866442f3908",
       "base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",
@@ -1928,7 +1928,7 @@
     },
     {
       "kind": "DojoContract",
-      "address": "0x4aee4238ae328cfe7ad116057e3e9ef083b75f13c1914a8f93ef32549ebe808",
+      "address": "0x33a28bd8c06940892f49b8d9211ddc5165ec9316087c1fa563e56152f95d429",
       "class_hash": "0x3daab1621bba5f43f0d84f8f68ee7a5dfa4d83f98f746e2e9dcd3a848233e35",
       "original_class_hash": "0x3daab1621bba5f43f0d84f8f68ee7a5dfa4d83f98f746e2e9dcd3a848233e35",
       "base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",
@@ -2147,7 +2147,7 @@
     },
     {
       "kind": "DojoContract",
-      "address": "0x1c6c32fc58a703d08ba0080ebf840e9c8021e86c37b239d28ce1a4576709ddc",
+      "address": "0x4de3cf22c1348202eaf06464aa308d1cbe8e6fea755ce4f0598a00d0e860886",
       "class_hash": "0x647fc1b2d2e902e6304e127b36995d8f57fe45c38e38e15d8860db508dbf24a",
       "original_class_hash": "0x647fc1b2d2e902e6304e127b36995d8f57fe45c38e38e15d8860db508dbf24a",
       "base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",
@@ -4159,8 +4159,8 @@
           "key": false
         }
       ],
-      "class_hash": "0x61fa996f7cf8412bb5aca7d4bd4fd9eca806a92e5007e87d23f638b6774ed40",
-      "original_class_hash": "0x61fa996f7cf8412bb5aca7d4bd4fd9eca806a92e5007e87d23f638b6774ed40",
+      "class_hash": "0x2bfdf50f9ec0670b52065947e6ce2e1ebb39d54d19da1b65411b6d58bb04e79",
+      "original_class_hash": "0x2bfdf50f9ec0670b52065947e6ce2e1ebb39d54d19da1b65411b6d58bb04e79",
       "abi": [
         {
           "type": "impl",
diff --git a/examples/spawn-and-move/manifests/dev/deployment/manifest.toml b/examples/spawn-and-move/manifests/dev/deployment/manifest.toml
index 064976b859..abfba40d43 100644
--- a/examples/spawn-and-move/manifests/dev/deployment/manifest.toml
+++ b/examples/spawn-and-move/manifests/dev/deployment/manifest.toml
@@ -1,10 +1,10 @@
 [world]
 kind = "WorldContract"
-class_hash = "0x2178527e9556d1aa21d3c2961d28f9114fcfed81b4c3674ed591c50ce46cc9d"
-original_class_hash = "0x2178527e9556d1aa21d3c2961d28f9114fcfed81b4c3674ed591c50ce46cc9d"
+class_hash = "0x14287624e97e0312d4e680e19071efce983810e909b32afc54cd9c8031f4c1c"
+original_class_hash = "0x14287624e97e0312d4e680e19071efce983810e909b32afc54cd9c8031f4c1c"
 abi = "manifests/dev/deployment/abis/dojo-world.json"
-address = "0x25e74888e786245ec7aa93d846b2cc9e4b49a5244209860bbf4b384f654521b"
-transaction_hash = "0x1606f5a86180d90027d33915cf0d62e117f778f8837df3c1375af3d3bc2951e"
+address = "0x2f6f0512832a8820173edb8e1adac28b7edc78bb3b6f038614adf4377b694c5"
+transaction_hash = "0x22c5e928ee07543e0eef5aae78ded9902d7d8647f76d46d743be2f2661ebab7"
 block_number = 3
 seed = "dojo_examples"
 manifest_name = "dojo-world"
@@ -23,9 +23,9 @@ manifest_name = "dojo-base"
 
 [[contracts]]
 kind = "DojoContract"
-address = "0x24d926d75cd84104c3bd24f0f79e95c273d6a99ed449f3c8b83114857020332"
-class_hash = "0x2a8de224c28cae3049e23b352e7fce6f26cc99884331e5f2a6aea261398a27a"
-original_class_hash = "0x2a8de224c28cae3049e23b352e7fce6f26cc99884331e5f2a6aea261398a27a"
+address = "0x66221f204a50d51e28d03bc1578bc1845371cd0f0932666b507cd9721c183ec"
+class_hash = "0xc0a5037a6fdc0b374b270ca5e9f3bd76200d73d01f409749b7006b3cd6c03d"
+original_class_hash = "0xc0a5037a6fdc0b374b270ca5e9f3bd76200d73d01f409749b7006b3cd6c03d"
 base_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
 abi = "manifests/dev/deployment/abis/contracts/dojo_examples-actions-40b6994c.json"
 reads = []
@@ -40,7 +40,7 @@ manifest_name = "dojo_examples-actions-40b6994c"
 
 [[contracts]]
 kind = "DojoContract"
-address = "0x31a348061c348eb84d7d9f1658244432170822cdb1a97a586805b565c168bcf"
+address = "0x71e9522f412f3458a3508d0449f8f3a4e1662da382c86393b3abb193d2968b5"
 class_hash = "0x45ad5a298db270a9c3ee439b7a7a008e3219b70937cfaa144589866442f3908"
 original_class_hash = "0x45ad5a298db270a9c3ee439b7a7a008e3219b70937cfaa144589866442f3908"
 base_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
@@ -54,7 +54,7 @@ manifest_name = "dojo_examples-dungeon-6620e0e6"
 
 [[contracts]]
 kind = "DojoContract"
-address = "0x4aee4238ae328cfe7ad116057e3e9ef083b75f13c1914a8f93ef32549ebe808"
+address = "0x33a28bd8c06940892f49b8d9211ddc5165ec9316087c1fa563e56152f95d429"
 class_hash = "0x3daab1621bba5f43f0d84f8f68ee7a5dfa4d83f98f746e2e9dcd3a848233e35"
 original_class_hash = "0x3daab1621bba5f43f0d84f8f68ee7a5dfa4d83f98f746e2e9dcd3a848233e35"
 base_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
@@ -68,7 +68,7 @@ manifest_name = "dojo_examples-mock_token-31599eb2"
 
 [[contracts]]
 kind = "DojoContract"
-address = "0x1c6c32fc58a703d08ba0080ebf840e9c8021e86c37b239d28ce1a4576709ddc"
+address = "0x4de3cf22c1348202eaf06464aa308d1cbe8e6fea755ce4f0598a00d0e860886"
 class_hash = "0x647fc1b2d2e902e6304e127b36995d8f57fe45c38e38e15d8860db508dbf24a"
 original_class_hash = "0x647fc1b2d2e902e6304e127b36995d8f57fe45c38e38e15d8860db508dbf24a"
 base_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
@@ -173,8 +173,8 @@ key = false
 
 [[models]]
 kind = "DojoModel"
-class_hash = "0x61fa996f7cf8412bb5aca7d4bd4fd9eca806a92e5007e87d23f638b6774ed40"
-original_class_hash = "0x61fa996f7cf8412bb5aca7d4bd4fd9eca806a92e5007e87d23f638b6774ed40"
+class_hash = "0x2bfdf50f9ec0670b52065947e6ce2e1ebb39d54d19da1b65411b6d58bb04e79"
+original_class_hash = "0x2bfdf50f9ec0670b52065947e6ce2e1ebb39d54d19da1b65411b6d58bb04e79"
 abi = "manifests/dev/deployment/abis/models/dojo_examples-Moves-2e2accba.json"
 tag = "dojo_examples-Moves"
 manifest_name = "dojo_examples-Moves-2e2accba"
diff --git a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml
index a12c96a2e4..2392bc9866 100644
--- a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml
+++ b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x2a8de224c28cae3049e23b352e7fce6f26cc99884331e5f2a6aea261398a27a"
-original_class_hash = "0x2a8de224c28cae3049e23b352e7fce6f26cc99884331e5f2a6aea261398a27a"
+class_hash = "0xc0a5037a6fdc0b374b270ca5e9f3bd76200d73d01f409749b7006b3cd6c03d"
+original_class_hash = "0xc0a5037a6fdc0b374b270ca5e9f3bd76200d73d01f409749b7006b3cd6c03d"
 base_class_hash = "0x0"
 abi = "manifests/release/base/abis/contracts/dojo_examples-actions-40b6994c.json"
 reads = []
diff --git a/examples/spawn-and-move/manifests/release/base/dojo-world.toml b/examples/spawn-and-move/manifests/release/base/dojo-world.toml
index cc1f0eda6a..f00a10eef7 100644
--- a/examples/spawn-and-move/manifests/release/base/dojo-world.toml
+++ b/examples/spawn-and-move/manifests/release/base/dojo-world.toml
@@ -1,6 +1,6 @@
 kind = "Class"
-class_hash = "0x2178527e9556d1aa21d3c2961d28f9114fcfed81b4c3674ed591c50ce46cc9d"
-original_class_hash = "0x2178527e9556d1aa21d3c2961d28f9114fcfed81b4c3674ed591c50ce46cc9d"
+class_hash = "0x14287624e97e0312d4e680e19071efce983810e909b32afc54cd9c8031f4c1c"
+original_class_hash = "0x14287624e97e0312d4e680e19071efce983810e909b32afc54cd9c8031f4c1c"
 abi = "manifests/release/base/abis/dojo-world.json"
 tag = "dojo-world"
 manifest_name = "dojo-world"
diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moves-2e2accba.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moves-2e2accba.toml
index a633e865bf..4642d2d1b9 100644
--- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moves-2e2accba.toml
+++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moves-2e2accba.toml
@@ -1,6 +1,6 @@
 kind = "DojoModel"
-class_hash = "0x61fa996f7cf8412bb5aca7d4bd4fd9eca806a92e5007e87d23f638b6774ed40"
-original_class_hash = "0x61fa996f7cf8412bb5aca7d4bd4fd9eca806a92e5007e87d23f638b6774ed40"
+class_hash = "0x2bfdf50f9ec0670b52065947e6ce2e1ebb39d54d19da1b65411b6d58bb04e79"
+original_class_hash = "0x2bfdf50f9ec0670b52065947e6ce2e1ebb39d54d19da1b65411b6d58bb04e79"
 abi = "manifests/release/base/abis/models/dojo_examples-Moves-2e2accba.json"
 tag = "dojo_examples-Moves"
 manifest_name = "dojo_examples-Moves-2e2accba"
diff --git a/scripts/clippy.sh b/scripts/clippy.sh
index c3e1a2e3d1..9fe1fb49d2 100755
--- a/scripts/clippy.sh
+++ b/scripts/clippy.sh
@@ -8,7 +8,7 @@ set -x
 set -o pipefail
 
 run_clippy() {
-  cargo clippy --all-targets "$@" -- -D warnings -D future-incompatible -D nonstandard-style -D rust-2018-idioms -D unused -D missing-debug-implementations
+  cargo +nightly clippy --all-targets "$@" -- -D warnings -D future-incompatible -D nonstandard-style -D rust-2018-idioms -D unused -D missing-debug-implementations
 }
 
 run_clippy --all-features --workspace --exclude katana --exclude katana-executor