--- a/.env
+++ b/.env
@@ -3,7 +3,7 @@
 POLKADOT_LAUNCH_BRANCH=unique-network
 RELAY_CHAIN_TYPE=westend
 
-POLKADOT_MAINNET_BRANCH=release-v0.9.34
+POLKADOT_MAINNET_BRANCH=release-v0.9.36
 STATEMINT_BUILD_BRANCH=release-parachains-v9360
 ACALA_BUILD_BRANCH=2.12.0
 MOONBEAM_BUILD_BRANCH=runtime-2000
@@ -13,15 +13,15 @@
 KUSAMA_MAINNET_BRANCH=release-v0.9.37
 STATEMINE_BUILD_BRANCH=release-parachains-v9360
 KARURA_BUILD_BRANCH=release-karura-2.12.0
-MOONRIVER_BUILD_BRANCH=runtime-2000
+MOONRIVER_BUILD_BRANCH=runtime-2100
 QUARTZ_MAINNET_BRANCH=release-v930034-fix-gas-price
 QUARTZ_REPLICA_FROM=wss://ws-quartz.unique.network:443
 
-UNIQUEWEST_MAINNET_BRANCH=release-v0.9.37
+UNIQUEWEST_MAINNET_BRANCH=release-v0.9.36
 WESTMINT_BUILD_BRANCH=parachains-v9370
-OPAL_MAINNET_BRANCH=release-v936050
+OPAL_MAINNET_BRANCH=release-v937052
 OPAL_REPLICA_FROM=wss://ws-opal.unique.network:443
 
 UNIQUEEAST_MAINNET_BRANCH=release-v0.9.32
-SAPPHIRE_MAINNET_BRANCH=release-v936040
+SAPPHIRE_MAINNET_BRANCH=release-v937052
 SAPPHIRE_REPLICA_FROM=wss://ws-sapphire.unique.network:443
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,5 +5,12 @@
     },
     "[typescript]": {
         "editor.defaultFormatter": "dbaeumer.vscode-eslint"
-    }
+    },
+    "rust-analyzer.cargo.extraEnv": {
+        "SKIP_WASM_BUILD": "1"
+    },
+    "rust-analyzer.cargo.features": [
+        "runtime-benchmarks",
+        "try-runtime"
+    ]
 }
\ No newline at end of file
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6272,6 +6272,7 @@
  "parity-scale-codec",
  "scale-info",
  "sp-core",
+ "sp-io",
  "sp-std",
 ]
 
--- a/migrations.md
+++ b/migrations.md
@@ -1,3 +1,11 @@
+# **937053 < 937052**
+
+* Removed the previous migration of AppPromition
+
+# **937052 < 937051**
+
+* Migrate AppPromotion from using reserves to locks
+
 # **936050 < 930032**
 
 ### **pallet-collator-selection:**
--- a/pallets/common/src/weights.rs
+++ b/pallets/common/src/weights.rs
@@ -3,7 +3,7 @@
 //! Autogenerated weights for pallet_common
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-29, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
 
 // Executed Command:
@@ -43,17 +43,17 @@
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Common CollectionProperties (r:1 w:1)
 	fn set_collection_properties(b: u32, ) -> Weight {
-		Weight::from_ref_time(9_881_000 as u64)
-			// Standard Error: 18_079
-			.saturating_add(Weight::from_ref_time(6_561_011 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(9_293_000 as u64)
+			// Standard Error: 14_275
+			.saturating_add(Weight::from_ref_time(6_172_391 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionProperties (r:1 w:1)
 	fn delete_collection_properties(b: u32, ) -> Weight {
-		Weight::from_ref_time(9_502_000 as u64)
-			// Standard Error: 67_255
-			.saturating_add(Weight::from_ref_time(22_203_766 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(8_945_000 as u64)
+			// Standard Error: 65_313
+			.saturating_add(Weight::from_ref_time(21_617_763 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
@@ -63,17 +63,17 @@
 impl WeightInfo for () {
 	// Storage: Common CollectionProperties (r:1 w:1)
 	fn set_collection_properties(b: u32, ) -> Weight {
-		Weight::from_ref_time(9_881_000 as u64)
-			// Standard Error: 18_079
-			.saturating_add(Weight::from_ref_time(6_561_011 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(9_293_000 as u64)
+			// Standard Error: 14_275
+			.saturating_add(Weight::from_ref_time(6_172_391 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionProperties (r:1 w:1)
 	fn delete_collection_properties(b: u32, ) -> Weight {
-		Weight::from_ref_time(9_502_000 as u64)
-			// Standard Error: 67_255
-			.saturating_add(Weight::from_ref_time(22_203_766 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(8_945_000 as u64)
+			// Standard Error: 65_313
+			.saturating_add(Weight::from_ref_time(21_617_763 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
--- a/pallets/configuration/src/weights.rs
+++ b/pallets/configuration/src/weights.rs
@@ -3,7 +3,7 @@
 //! Autogenerated weights for pallet_configuration
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-29, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
 
 // Executed Command:
@@ -48,37 +48,37 @@
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Configuration WeightToFeeCoefficientOverride (r:0 w:1)
 	fn set_weight_to_fee_coefficient_override() -> Weight {
-		Weight::from_ref_time(3_865_000 as u64)
+		Weight::from_ref_time(3_732_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Configuration MinGasPriceOverride (r:0 w:1)
 	fn set_min_gas_price_override() -> Weight {
-		Weight::from_ref_time(4_221_000 as u64)
+		Weight::from_ref_time(3_625_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Configuration XcmAllowedLocationsOverride (r:0 w:1)
 	fn set_xcm_allowed_locations() -> Weight {
-		Weight::from_ref_time(5_329_000 as u64)
+		Weight::from_ref_time(3_975_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Configuration AppPromomotionConfigurationOverride (r:0 w:1)
 	fn set_app_promotion_configuration_override() -> Weight {
-		Weight::from_ref_time(5_805_000 as u64)
+		Weight::from_ref_time(4_759_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Configuration CollatorSelectionDesiredCollatorsOverride (r:0 w:1)
 	fn set_collator_selection_desired_collators() -> Weight {
-		Weight::from_ref_time(21_590_000 as u64)
+		Weight::from_ref_time(18_296_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Configuration CollatorSelectionLicenseBondOverride (r:0 w:1)
 	fn set_collator_selection_license_bond() -> Weight {
-		Weight::from_ref_time(15_141_000 as u64)
+		Weight::from_ref_time(14_397_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Configuration CollatorSelectionKickThresholdOverride (r:0 w:1)
 	fn set_collator_selection_kick_threshold() -> Weight {
-		Weight::from_ref_time(12_042_000 as u64)
+		Weight::from_ref_time(13_951_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 }
@@ -87,37 +87,37 @@
 impl WeightInfo for () {
 	// Storage: Configuration WeightToFeeCoefficientOverride (r:0 w:1)
 	fn set_weight_to_fee_coefficient_override() -> Weight {
-		Weight::from_ref_time(3_865_000 as u64)
+		Weight::from_ref_time(3_732_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Configuration MinGasPriceOverride (r:0 w:1)
 	fn set_min_gas_price_override() -> Weight {
-		Weight::from_ref_time(4_221_000 as u64)
+		Weight::from_ref_time(3_625_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Configuration XcmAllowedLocationsOverride (r:0 w:1)
 	fn set_xcm_allowed_locations() -> Weight {
-		Weight::from_ref_time(5_329_000 as u64)
+		Weight::from_ref_time(3_975_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Configuration AppPromomotionConfigurationOverride (r:0 w:1)
 	fn set_app_promotion_configuration_override() -> Weight {
-		Weight::from_ref_time(5_805_000 as u64)
+		Weight::from_ref_time(4_759_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Configuration CollatorSelectionDesiredCollatorsOverride (r:0 w:1)
 	fn set_collator_selection_desired_collators() -> Weight {
-		Weight::from_ref_time(21_590_000 as u64)
+		Weight::from_ref_time(18_296_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Configuration CollatorSelectionLicenseBondOverride (r:0 w:1)
 	fn set_collator_selection_license_bond() -> Weight {
-		Weight::from_ref_time(15_141_000 as u64)
+		Weight::from_ref_time(14_397_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Configuration CollatorSelectionKickThresholdOverride (r:0 w:1)
 	fn set_collator_selection_kick_threshold() -> Weight {
-		Weight::from_ref_time(12_042_000 as u64)
+		Weight::from_ref_time(13_951_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 }
--- a/pallets/evm-contract-helpers/src/lib.rs
+++ b/pallets/evm-contract-helpers/src/lib.rs
@@ -33,9 +33,10 @@
 pub mod pallet {
 	pub use super::*;
 	use crate::eth::ContractHelpersEvents;
-	use frame_support::pallet_prelude::*;
-	use pallet_evm_coder_substrate::DispatchResult;
+	use frame_support::{pallet_prelude::*, sp_runtime::DispatchResult};
+	use frame_system::{pallet_prelude::OriginFor, ensure_root};
 	use sp_core::{H160, U256};
+	use sp_std::vec::Vec;
 	use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
 	use up_data_structs::SponsorshipState;
 	use evm_coder::ToLog;
@@ -199,6 +200,28 @@
 		),
 	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// Migrate contract to use `SponsoringMode` storage instead of `SelfSponsoring`
+		#[pallet::call_index(0)]
+		#[pallet::weight(<T as frame_system::Config>::DbWeight::get().reads_writes(
+			addresses.len() as u64, addresses.len() as u64 * 2
+		))]
+		pub fn migrate_from_self_sponsoring(
+			origin: OriginFor<T>,
+			addresses: Vec<H160>,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+			for address in addresses {
+				if <SelfSponsoring<T>>::get(address) {
+					<SponsoringMode<T>>::set(address, Some(SponsoringModeT::Allowlisted));
+					<SelfSponsoring<T>>::remove(address);
+				}
+			}
+			Ok(())
+		}
+	}
+
 	impl<T: Config> Pallet<T> {
 		/// Get contract owner.
 		pub fn contract_owner(contract: H160) -> H160 {
--- a/pallets/evm-migration/Cargo.toml
+++ b/pallets/evm-migration/Cargo.toml
@@ -16,9 +16,10 @@
 scale-info = { workspace = true }
 sp-core = { workspace = true }
 sp-std = { workspace = true }
+sp-io = { workspace = true }
 
 [features]
 default = ["runtime-benchmarks", "std"]
 runtime-benchmarks = ["frame-benchmarking"]
-std = ["frame-benchmarking/std", "frame-support/std", "frame-system/std", "pallet-evm/std", "sp-core/std", "sp-std/std"]
+std = ["frame-benchmarking/std", "frame-support/std", "frame-system/std", "pallet-evm/std", "sp-core/std", "sp-std/std", "sp-io/std"]
 try-runtime = ["frame-support/try-runtime"]
--- a/pallets/evm-migration/src/lib.rs
+++ b/pallets/evm-migration/src/lib.rs
@@ -149,6 +149,17 @@
 			}
 			Ok(())
 		}
+
+		/// Remove remark compatibility data leftovers
+		#[pallet::call_index(5)]
+		#[pallet::weight(<T as frame_system::Config>::DbWeight::get().reads_writes(10, 10))]
+		pub fn remove_rmrk_data(origin: OriginFor<T>) -> DispatchResult {
+			use sp_io::hashing::twox_128;
+			ensure_root(origin)?;
+			let _ = sp_io::storage::clear_prefix(&twox_128(b"RmrkEquip"), Some(5));
+			let _ = sp_io::storage::clear_prefix(&twox_128(b"RmrkCore"), Some(5));
+			Ok(())
+		}
 	}
 
 	/// Implements [`pallet_evm::OnMethodCall`], which reserves accounts with pending migration
--- a/pallets/evm-migration/src/weights.rs
+++ b/pallets/evm-migration/src/weights.rs
@@ -3,7 +3,7 @@
 //! Autogenerated weights for pallet_evm_migration
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-29, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
 
 // Executed Command:
@@ -48,35 +48,37 @@
 	// Storage: System Account (r:1 w:0)
 	// Storage: EVM AccountCodes (r:1 w:0)
 	fn begin() -> Weight {
-		Weight::from_ref_time(16_189_000 as u64)
+		Weight::from_ref_time(16_052_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(3 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: EvmMigration MigrationPending (r:1 w:0)
 	// Storage: EVM AccountStorages (r:0 w:1)
 	fn set_data(b: u32, ) -> Weight {
-		Weight::from_ref_time(7_829_947 as u64)
-			// Standard Error: 687
-			.saturating_add(Weight::from_ref_time(968_768 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(9_257_564 as u64)
+			// Standard Error: 1_384
+			.saturating_add(Weight::from_ref_time(939_454 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(b as u64)))
 	}
 	// Storage: EvmMigration MigrationPending (r:1 w:1)
 	// Storage: EVM AccountCodes (r:0 w:1)
-	fn finish(_b: u32, ) -> Weight {
-		Weight::from_ref_time(9_559_086 as u64)
+	fn finish(b: u32, ) -> Weight {
+		Weight::from_ref_time(9_832_338 as u64)
+			// Standard Error: 351
+			.saturating_add(Weight::from_ref_time(415 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
 	fn insert_eth_logs(b: u32, ) -> Weight {
-		Weight::from_ref_time(7_535_186 as u64)
-			// Standard Error: 1_440
-			.saturating_add(Weight::from_ref_time(699_517 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(7_589_210 as u64)
+			// Standard Error: 864
+			.saturating_add(Weight::from_ref_time(688_444 as u64).saturating_mul(b as u64))
 	}
 	fn insert_events(b: u32, ) -> Weight {
-		Weight::from_ref_time(10_612_317 as u64)
-			// Standard Error: 999
-			.saturating_add(Weight::from_ref_time(1_296_893 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(11_531_726 as u64)
+			// Standard Error: 580
+			.saturating_add(Weight::from_ref_time(1_271_608 as u64).saturating_mul(b as u64))
 	}
 }
 
@@ -86,34 +88,36 @@
 	// Storage: System Account (r:1 w:0)
 	// Storage: EVM AccountCodes (r:1 w:0)
 	fn begin() -> Weight {
-		Weight::from_ref_time(16_189_000 as u64)
+		Weight::from_ref_time(16_052_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(3 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: EvmMigration MigrationPending (r:1 w:0)
 	// Storage: EVM AccountStorages (r:0 w:1)
 	fn set_data(b: u32, ) -> Weight {
-		Weight::from_ref_time(7_829_947 as u64)
-			// Standard Error: 687
-			.saturating_add(Weight::from_ref_time(968_768 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(9_257_564 as u64)
+			// Standard Error: 1_384
+			.saturating_add(Weight::from_ref_time(939_454 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes((1 as u64).saturating_mul(b as u64)))
 	}
 	// Storage: EvmMigration MigrationPending (r:1 w:1)
 	// Storage: EVM AccountCodes (r:0 w:1)
-	fn finish(_b: u32, ) -> Weight {
-		Weight::from_ref_time(9_559_086 as u64)
+	fn finish(b: u32, ) -> Weight {
+		Weight::from_ref_time(9_832_338 as u64)
+			// Standard Error: 351
+			.saturating_add(Weight::from_ref_time(415 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
 	}
 	fn insert_eth_logs(b: u32, ) -> Weight {
-		Weight::from_ref_time(7_535_186 as u64)
-			// Standard Error: 1_440
-			.saturating_add(Weight::from_ref_time(699_517 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(7_589_210 as u64)
+			// Standard Error: 864
+			.saturating_add(Weight::from_ref_time(688_444 as u64).saturating_mul(b as u64))
 	}
 	fn insert_events(b: u32, ) -> Weight {
-		Weight::from_ref_time(10_612_317 as u64)
-			// Standard Error: 999
-			.saturating_add(Weight::from_ref_time(1_296_893 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(11_531_726 as u64)
+			// Standard Error: 580
+			.saturating_add(Weight::from_ref_time(1_271_608 as u64).saturating_mul(b as u64))
 	}
 }
--- a/pallets/foreign-assets/src/weights.rs
+++ b/pallets/foreign-assets/src/weights.rs
@@ -3,7 +3,7 @@
 //! Autogenerated weights for pallet_foreign_assets
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-29, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
 
 // Executed Command:
@@ -53,14 +53,14 @@
 	// Storage: Common CollectionProperties (r:0 w:1)
 	// Storage: Common CollectionById (r:0 w:1)
 	fn register_foreign_asset() -> Weight {
-		Weight::from_ref_time(50_058_000 as u64)
+		Weight::from_ref_time(49_269_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(9 as u64))
 			.saturating_add(T::DbWeight::get().writes(11 as u64))
 	}
 	// Storage: ForeignAssets ForeignAssetLocations (r:1 w:1)
 	// Storage: ForeignAssets AssetMetadatas (r:1 w:1)
 	fn update_foreign_asset() -> Weight {
-		Weight::from_ref_time(22_669_000 as u64)
+		Weight::from_ref_time(21_973_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
@@ -80,14 +80,14 @@
 	// Storage: Common CollectionProperties (r:0 w:1)
 	// Storage: Common CollectionById (r:0 w:1)
 	fn register_foreign_asset() -> Weight {
-		Weight::from_ref_time(50_058_000 as u64)
+		Weight::from_ref_time(49_269_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(9 as u64))
 			.saturating_add(RocksDbWeight::get().writes(11 as u64))
 	}
 	// Storage: ForeignAssets ForeignAssetLocations (r:1 w:1)
 	// Storage: ForeignAssets AssetMetadatas (r:1 w:1)
 	fn update_foreign_asset() -> Weight {
-		Weight::from_ref_time(22_669_000 as u64)
+		Weight::from_ref_time(21_973_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
 	}
--- a/pallets/fungible/src/weights.rs
+++ b/pallets/fungible/src/weights.rs
@@ -3,7 +3,7 @@
 //! Autogenerated weights for pallet_fungible
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-29, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
 
 // Executed Command:
@@ -50,16 +50,16 @@
 	// Storage: Fungible TotalSupply (r:1 w:1)
 	// Storage: Fungible Balance (r:1 w:1)
 	fn create_item() -> Weight {
-		Weight::from_ref_time(20_606_000 as u64)
+		Weight::from_ref_time(19_423_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
 	// Storage: Fungible TotalSupply (r:1 w:1)
 	// Storage: Fungible Balance (r:4 w:4)
 	fn create_multiple_items_ex(b: u32, ) -> Weight {
-		Weight::from_ref_time(21_771_237 as u64)
-			// Standard Error: 10_207
-			.saturating_add(Weight::from_ref_time(3_627_533 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(23_426_461 as u64)
+			// Standard Error: 1_942
+			.saturating_add(Weight::from_ref_time(3_459_389 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64)))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
@@ -68,34 +68,34 @@
 	// Storage: Fungible TotalSupply (r:1 w:1)
 	// Storage: Fungible Balance (r:1 w:1)
 	fn burn_item() -> Weight {
-		Weight::from_ref_time(22_468_000 as u64)
+		Weight::from_ref_time(22_600_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
 	// Storage: Fungible Balance (r:2 w:2)
 	fn transfer() -> Weight {
-		Weight::from_ref_time(23_377_000 as u64)
+		Weight::from_ref_time(24_015_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
 	// Storage: Fungible Balance (r:1 w:0)
 	// Storage: Fungible Allowance (r:0 w:1)
 	fn approve() -> Weight {
-		Weight::from_ref_time(22_704_000 as u64)
+		Weight::from_ref_time(22_478_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Fungible Balance (r:1 w:0)
 	// Storage: Fungible Allowance (r:0 w:1)
 	fn approve_from() -> Weight {
-		Weight::from_ref_time(22_777_000 as u64)
+		Weight::from_ref_time(22_522_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Fungible Allowance (r:1 w:1)
 	// Storage: Fungible Balance (r:2 w:2)
 	fn transfer_from() -> Weight {
-		Weight::from_ref_time(32_568_000 as u64)
+		Weight::from_ref_time(32_061_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(3 as u64))
 			.saturating_add(T::DbWeight::get().writes(3 as u64))
 	}
@@ -103,7 +103,7 @@
 	// Storage: Fungible TotalSupply (r:1 w:1)
 	// Storage: Fungible Balance (r:1 w:1)
 	fn burn_from() -> Weight {
-		Weight::from_ref_time(32_838_000 as u64)
+		Weight::from_ref_time(32_115_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(3 as u64))
 			.saturating_add(T::DbWeight::get().writes(3 as u64))
 	}
@@ -114,16 +114,16 @@
 	// Storage: Fungible TotalSupply (r:1 w:1)
 	// Storage: Fungible Balance (r:1 w:1)
 	fn create_item() -> Weight {
-		Weight::from_ref_time(20_606_000 as u64)
+		Weight::from_ref_time(19_423_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
 	}
 	// Storage: Fungible TotalSupply (r:1 w:1)
 	// Storage: Fungible Balance (r:4 w:4)
 	fn create_multiple_items_ex(b: u32, ) -> Weight {
-		Weight::from_ref_time(21_771_237 as u64)
-			// Standard Error: 10_207
-			.saturating_add(Weight::from_ref_time(3_627_533 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(23_426_461 as u64)
+			// Standard Error: 1_942
+			.saturating_add(Weight::from_ref_time(3_459_389 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(b as u64)))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
@@ -132,34 +132,34 @@
 	// Storage: Fungible TotalSupply (r:1 w:1)
 	// Storage: Fungible Balance (r:1 w:1)
 	fn burn_item() -> Weight {
-		Weight::from_ref_time(22_468_000 as u64)
+		Weight::from_ref_time(22_600_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
 	}
 	// Storage: Fungible Balance (r:2 w:2)
 	fn transfer() -> Weight {
-		Weight::from_ref_time(23_377_000 as u64)
+		Weight::from_ref_time(24_015_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
 	}
 	// Storage: Fungible Balance (r:1 w:0)
 	// Storage: Fungible Allowance (r:0 w:1)
 	fn approve() -> Weight {
-		Weight::from_ref_time(22_704_000 as u64)
+		Weight::from_ref_time(22_478_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Fungible Balance (r:1 w:0)
 	// Storage: Fungible Allowance (r:0 w:1)
 	fn approve_from() -> Weight {
-		Weight::from_ref_time(22_777_000 as u64)
+		Weight::from_ref_time(22_522_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Fungible Allowance (r:1 w:1)
 	// Storage: Fungible Balance (r:2 w:2)
 	fn transfer_from() -> Weight {
-		Weight::from_ref_time(32_568_000 as u64)
+		Weight::from_ref_time(32_061_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(3 as u64))
 			.saturating_add(RocksDbWeight::get().writes(3 as u64))
 	}
@@ -167,7 +167,7 @@
 	// Storage: Fungible TotalSupply (r:1 w:1)
 	// Storage: Fungible Balance (r:1 w:1)
 	fn burn_from() -> Weight {
-		Weight::from_ref_time(32_838_000 as u64)
+		Weight::from_ref_time(32_115_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(3 as u64))
 			.saturating_add(RocksDbWeight::get().writes(3 as u64))
 	}
--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -3,7 +3,7 @@
 //! Autogenerated weights for pallet_nonfungible
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-29, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
 
 // Executed Command:
@@ -64,7 +64,7 @@
 	// Storage: Nonfungible TokenData (r:0 w:1)
 	// Storage: Nonfungible Owned (r:0 w:1)
 	fn create_item() -> Weight {
-		Weight::from_ref_time(34_313_000 as u64)
+		Weight::from_ref_time(35_333_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(4 as u64))
 			.saturating_add(T::DbWeight::get().writes(5 as u64))
 	}
@@ -75,9 +75,9 @@
 	// Storage: Nonfungible TokenData (r:0 w:4)
 	// Storage: Nonfungible Owned (r:0 w:4)
 	fn create_multiple_items(b: u32, ) -> Weight {
-		Weight::from_ref_time(19_201_665 as u64)
-			// Standard Error: 4_780
-			.saturating_add(Weight::from_ref_time(7_373_591 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(19_091_371 as u64)
+			// Standard Error: 3_221
+			.saturating_add(Weight::from_ref_time(7_304_849 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(3 as u64))
 			.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64)))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
@@ -90,9 +90,9 @@
 	// Storage: Nonfungible TokenData (r:0 w:4)
 	// Storage: Nonfungible Owned (r:0 w:4)
 	fn create_multiple_items_ex(b: u32, ) -> Weight {
-		Weight::from_ref_time(13_021_971 as u64)
-			// Standard Error: 5_117
-			.saturating_add(Weight::from_ref_time(9_163_935 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(12_655_339 as u64)
+			// Standard Error: 3_655
+			.saturating_add(Weight::from_ref_time(9_051_919 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(b as u64)))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
@@ -106,7 +106,7 @@
 	// Storage: Nonfungible Owned (r:0 w:1)
 	// Storage: Nonfungible TokenProperties (r:0 w:1)
 	fn burn_item() -> Weight {
-		Weight::from_ref_time(35_727_000 as u64)
+		Weight::from_ref_time(34_068_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 			.saturating_add(T::DbWeight::get().writes(5 as u64))
 	}
@@ -118,7 +118,7 @@
 	// Storage: Nonfungible Owned (r:0 w:1)
 	// Storage: Nonfungible TokenProperties (r:0 w:1)
 	fn burn_recursively_self_raw() -> Weight {
-		Weight::from_ref_time(44_618_000 as u64)
+		Weight::from_ref_time(44_840_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 			.saturating_add(T::DbWeight::get().writes(5 as u64))
 	}
@@ -131,9 +131,9 @@
 	// Storage: Nonfungible TokenProperties (r:0 w:1)
 	// Storage: Common CollectionById (r:1 w:0)
 	fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(b: u32, ) -> Weight {
-		Weight::from_ref_time(45_095_000 as u64)
-			// Standard Error: 1_034_807
-			.saturating_add(Weight::from_ref_time(215_008_105 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(44_567_000 as u64)
+			// Standard Error: 1_014_743
+			.saturating_add(Weight::from_ref_time(209_619_240 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(7 as u64))
 			.saturating_add(T::DbWeight::get().reads((4 as u64).saturating_mul(b as u64)))
 			.saturating_add(T::DbWeight::get().writes(6 as u64))
@@ -144,21 +144,21 @@
 	// Storage: Nonfungible Allowance (r:1 w:0)
 	// Storage: Nonfungible Owned (r:0 w:2)
 	fn transfer() -> Weight {
-		Weight::from_ref_time(29_636_000 as u64)
+		Weight::from_ref_time(29_508_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(4 as u64))
 			.saturating_add(T::DbWeight::get().writes(5 as u64))
 	}
 	// Storage: Nonfungible TokenData (r:1 w:0)
 	// Storage: Nonfungible Allowance (r:1 w:1)
 	fn approve() -> Weight {
-		Weight::from_ref_time(22_440_000 as u64)
+		Weight::from_ref_time(22_168_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Nonfungible TokenData (r:1 w:0)
 	// Storage: Nonfungible Allowance (r:1 w:1)
 	fn approve_from() -> Weight {
-		Weight::from_ref_time(22_519_000 as u64)
+		Weight::from_ref_time(22_063_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
@@ -167,7 +167,7 @@
 	// Storage: Nonfungible AccountBalance (r:2 w:2)
 	// Storage: Nonfungible Owned (r:0 w:2)
 	fn transfer_from() -> Weight {
-		Weight::from_ref_time(36_354_000 as u64)
+		Weight::from_ref_time(36_386_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(4 as u64))
 			.saturating_add(T::DbWeight::get().writes(6 as u64))
 	}
@@ -179,54 +179,54 @@
 	// Storage: Nonfungible Owned (r:0 w:1)
 	// Storage: Nonfungible TokenProperties (r:0 w:1)
 	fn burn_from() -> Weight {
-		Weight::from_ref_time(42_533_000 as u64)
+		Weight::from_ref_time(42_499_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 			.saturating_add(T::DbWeight::get().writes(6 as u64))
 	}
 	// Storage: Common CollectionPropertyPermissions (r:1 w:1)
 	fn set_token_property_permissions(b: u32, ) -> Weight {
-		Weight::from_ref_time(5_189_000 as u64)
-			// Standard Error: 45_637
-			.saturating_add(Weight::from_ref_time(12_760_623 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(5_317_000 as u64)
+			// Standard Error: 42_045
+			.saturating_add(Weight::from_ref_time(12_179_871 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Nonfungible TokenProperties (r:1 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:1 w:0)
 	fn set_token_properties(b: u32, ) -> Weight {
-		Weight::from_ref_time(22_023_308 as u64)
-			// Standard Error: 10_490
-			.saturating_add(Weight::from_ref_time(6_199_746 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(15_428_000 as u64)
+			// Standard Error: 58_002
+			.saturating_add(Weight::from_ref_time(7_195_842 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Nonfungible TokenProperties (r:1 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:1 w:0)
 	fn delete_token_properties(b: u32, ) -> Weight {
-		Weight::from_ref_time(15_064_000 as u64)
-			// Standard Error: 70_297
-			.saturating_add(Weight::from_ref_time(22_826_857 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(15_498_000 as u64)
+			// Standard Error: 68_276
+			.saturating_add(Weight::from_ref_time(22_441_281 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Nonfungible TokenData (r:1 w:0)
 	fn token_owner() -> Weight {
-		Weight::from_ref_time(6_837_000 as u64)
+		Weight::from_ref_time(7_006_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 	}
 	// Storage: Nonfungible CollectionAllowance (r:0 w:1)
 	fn set_allowance_for_all() -> Weight {
-		Weight::from_ref_time(16_618_000 as u64)
+		Weight::from_ref_time(16_761_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Nonfungible CollectionAllowance (r:1 w:0)
 	fn allowance_for_all() -> Weight {
-		Weight::from_ref_time(5_430_000 as u64)
+		Weight::from_ref_time(5_577_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 	}
 	// Storage: Nonfungible TokenProperties (r:1 w:1)
 	fn repair_item() -> Weight {
-		Weight::from_ref_time(7_776_000 as u64)
+		Weight::from_ref_time(7_670_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
@@ -241,7 +241,7 @@
 	// Storage: Nonfungible TokenData (r:0 w:1)
 	// Storage: Nonfungible Owned (r:0 w:1)
 	fn create_item() -> Weight {
-		Weight::from_ref_time(34_313_000 as u64)
+		Weight::from_ref_time(35_333_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(4 as u64))
 			.saturating_add(RocksDbWeight::get().writes(5 as u64))
 	}
@@ -252,9 +252,9 @@
 	// Storage: Nonfungible TokenData (r:0 w:4)
 	// Storage: Nonfungible Owned (r:0 w:4)
 	fn create_multiple_items(b: u32, ) -> Weight {
-		Weight::from_ref_time(19_201_665 as u64)
-			// Standard Error: 4_780
-			.saturating_add(Weight::from_ref_time(7_373_591 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(19_091_371 as u64)
+			// Standard Error: 3_221
+			.saturating_add(Weight::from_ref_time(7_304_849 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(3 as u64))
 			.saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(b as u64)))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
@@ -267,9 +267,9 @@
 	// Storage: Nonfungible TokenData (r:0 w:4)
 	// Storage: Nonfungible Owned (r:0 w:4)
 	fn create_multiple_items_ex(b: u32, ) -> Weight {
-		Weight::from_ref_time(13_021_971 as u64)
-			// Standard Error: 5_117
-			.saturating_add(Weight::from_ref_time(9_163_935 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(12_655_339 as u64)
+			// Standard Error: 3_655
+			.saturating_add(Weight::from_ref_time(9_051_919 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(b as u64)))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
@@ -283,7 +283,7 @@
 	// Storage: Nonfungible Owned (r:0 w:1)
 	// Storage: Nonfungible TokenProperties (r:0 w:1)
 	fn burn_item() -> Weight {
-		Weight::from_ref_time(35_727_000 as u64)
+		Weight::from_ref_time(34_068_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(5 as u64))
 			.saturating_add(RocksDbWeight::get().writes(5 as u64))
 	}
@@ -295,7 +295,7 @@
 	// Storage: Nonfungible Owned (r:0 w:1)
 	// Storage: Nonfungible TokenProperties (r:0 w:1)
 	fn burn_recursively_self_raw() -> Weight {
-		Weight::from_ref_time(44_618_000 as u64)
+		Weight::from_ref_time(44_840_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(5 as u64))
 			.saturating_add(RocksDbWeight::get().writes(5 as u64))
 	}
@@ -308,9 +308,9 @@
 	// Storage: Nonfungible TokenProperties (r:0 w:1)
 	// Storage: Common CollectionById (r:1 w:0)
 	fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(b: u32, ) -> Weight {
-		Weight::from_ref_time(45_095_000 as u64)
-			// Standard Error: 1_034_807
-			.saturating_add(Weight::from_ref_time(215_008_105 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(44_567_000 as u64)
+			// Standard Error: 1_014_743
+			.saturating_add(Weight::from_ref_time(209_619_240 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(7 as u64))
 			.saturating_add(RocksDbWeight::get().reads((4 as u64).saturating_mul(b as u64)))
 			.saturating_add(RocksDbWeight::get().writes(6 as u64))
@@ -321,21 +321,21 @@
 	// Storage: Nonfungible Allowance (r:1 w:0)
 	// Storage: Nonfungible Owned (r:0 w:2)
 	fn transfer() -> Weight {
-		Weight::from_ref_time(29_636_000 as u64)
+		Weight::from_ref_time(29_508_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(4 as u64))
 			.saturating_add(RocksDbWeight::get().writes(5 as u64))
 	}
 	// Storage: Nonfungible TokenData (r:1 w:0)
 	// Storage: Nonfungible Allowance (r:1 w:1)
 	fn approve() -> Weight {
-		Weight::from_ref_time(22_440_000 as u64)
+		Weight::from_ref_time(22_168_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Nonfungible TokenData (r:1 w:0)
 	// Storage: Nonfungible Allowance (r:1 w:1)
 	fn approve_from() -> Weight {
-		Weight::from_ref_time(22_519_000 as u64)
+		Weight::from_ref_time(22_063_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
@@ -344,7 +344,7 @@
 	// Storage: Nonfungible AccountBalance (r:2 w:2)
 	// Storage: Nonfungible Owned (r:0 w:2)
 	fn transfer_from() -> Weight {
-		Weight::from_ref_time(36_354_000 as u64)
+		Weight::from_ref_time(36_386_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(4 as u64))
 			.saturating_add(RocksDbWeight::get().writes(6 as u64))
 	}
@@ -356,54 +356,54 @@
 	// Storage: Nonfungible Owned (r:0 w:1)
 	// Storage: Nonfungible TokenProperties (r:0 w:1)
 	fn burn_from() -> Weight {
-		Weight::from_ref_time(42_533_000 as u64)
+		Weight::from_ref_time(42_499_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(5 as u64))
 			.saturating_add(RocksDbWeight::get().writes(6 as u64))
 	}
 	// Storage: Common CollectionPropertyPermissions (r:1 w:1)
 	fn set_token_property_permissions(b: u32, ) -> Weight {
-		Weight::from_ref_time(5_189_000 as u64)
-			// Standard Error: 45_637
-			.saturating_add(Weight::from_ref_time(12_760_623 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(5_317_000 as u64)
+			// Standard Error: 42_045
+			.saturating_add(Weight::from_ref_time(12_179_871 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Nonfungible TokenProperties (r:1 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:1 w:0)
 	fn set_token_properties(b: u32, ) -> Weight {
-		Weight::from_ref_time(22_023_308 as u64)
-			// Standard Error: 10_490
-			.saturating_add(Weight::from_ref_time(6_199_746 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(15_428_000 as u64)
+			// Standard Error: 58_002
+			.saturating_add(Weight::from_ref_time(7_195_842 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Nonfungible TokenProperties (r:1 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:1 w:0)
 	fn delete_token_properties(b: u32, ) -> Weight {
-		Weight::from_ref_time(15_064_000 as u64)
-			// Standard Error: 70_297
-			.saturating_add(Weight::from_ref_time(22_826_857 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(15_498_000 as u64)
+			// Standard Error: 68_276
+			.saturating_add(Weight::from_ref_time(22_441_281 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Nonfungible TokenData (r:1 w:0)
 	fn token_owner() -> Weight {
-		Weight::from_ref_time(6_837_000 as u64)
+		Weight::from_ref_time(7_006_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 	}
 	// Storage: Nonfungible CollectionAllowance (r:0 w:1)
 	fn set_allowance_for_all() -> Weight {
-		Weight::from_ref_time(16_618_000 as u64)
+		Weight::from_ref_time(16_761_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Nonfungible CollectionAllowance (r:1 w:0)
 	fn allowance_for_all() -> Weight {
-		Weight::from_ref_time(5_430_000 as u64)
+		Weight::from_ref_time(5_577_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 	}
 	// Storage: Nonfungible TokenProperties (r:1 w:1)
 	fn repair_item() -> Weight {
-		Weight::from_ref_time(7_776_000 as u64)
+		Weight::from_ref_time(7_670_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -3,7 +3,7 @@
 //! Autogenerated weights for pallet_refungible
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-29, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
 
 // Executed Command:
@@ -72,7 +72,7 @@
 	// Storage: Refungible TotalSupply (r:0 w:1)
 	// Storage: Refungible Owned (r:0 w:1)
 	fn create_item() -> Weight {
-		Weight::from_ref_time(39_775_000 as u64)
+		Weight::from_ref_time(39_971_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(4 as u64))
 			.saturating_add(T::DbWeight::get().writes(6 as u64))
 	}
@@ -84,9 +84,9 @@
 	// Storage: Refungible TotalSupply (r:0 w:4)
 	// Storage: Refungible Owned (r:0 w:4)
 	fn create_multiple_items(b: u32, ) -> Weight {
-		Weight::from_ref_time(19_486_095 as u64)
-			// Standard Error: 8_015
-			.saturating_add(Weight::from_ref_time(9_037_181 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(14_049_866 as u64)
+			// Standard Error: 4_015
+			.saturating_add(Weight::from_ref_time(8_984_911 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(3 as u64))
 			.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64)))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
@@ -100,9 +100,9 @@
 	// Storage: Refungible TotalSupply (r:0 w:4)
 	// Storage: Refungible Owned (r:0 w:4)
 	fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {
-		Weight::from_ref_time(14_091_538 as u64)
-			// Standard Error: 6_448
-			.saturating_add(Weight::from_ref_time(10_777_780 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(14_893_679 as u64)
+			// Standard Error: 3_571
+			.saturating_add(Weight::from_ref_time(10_611_135 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(b as u64)))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
@@ -116,9 +116,9 @@
 	// Storage: Refungible Balance (r:0 w:4)
 	// Storage: Refungible Owned (r:0 w:4)
 	fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {
-		Weight::from_ref_time(30_958_687 as u64)
-			// Standard Error: 3_000
-			.saturating_add(Weight::from_ref_time(5_976_114 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(31_075_923 as u64)
+			// Standard Error: 2_118
+			.saturating_add(Weight::from_ref_time(5_829_866 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(3 as u64))
 			.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64)))
 			.saturating_add(T::DbWeight::get().writes(3 as u64))
@@ -129,7 +129,7 @@
 	// Storage: Refungible AccountBalance (r:1 w:1)
 	// Storage: Refungible Owned (r:0 w:1)
 	fn burn_item_partial() -> Weight {
-		Weight::from_ref_time(46_498_000 as u64)
+		Weight::from_ref_time(47_369_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 			.saturating_add(T::DbWeight::get().writes(4 as u64))
 	}
@@ -140,14 +140,14 @@
 	// Storage: Refungible Owned (r:0 w:1)
 	// Storage: Refungible TokenProperties (r:0 w:1)
 	fn burn_item_fully() -> Weight {
-		Weight::from_ref_time(42_429_000 as u64)
+		Weight::from_ref_time(41_351_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(4 as u64))
 			.saturating_add(T::DbWeight::get().writes(6 as u64))
 	}
 	// Storage: Refungible Balance (r:2 w:2)
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	fn transfer_normal() -> Weight {
-		Weight::from_ref_time(31_435_000 as u64)
+		Weight::from_ref_time(31_379_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(3 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
@@ -156,7 +156,7 @@
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	// Storage: Refungible Owned (r:0 w:1)
 	fn transfer_creating() -> Weight {
-		Weight::from_ref_time(34_913_000 as u64)
+		Weight::from_ref_time(34_829_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(4 as u64))
 			.saturating_add(T::DbWeight::get().writes(4 as u64))
 	}
@@ -165,7 +165,7 @@
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	// Storage: Refungible Owned (r:0 w:1)
 	fn transfer_removing() -> Weight {
-		Weight::from_ref_time(37_992_000 as u64)
+		Weight::from_ref_time(38_221_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(4 as u64))
 			.saturating_add(T::DbWeight::get().writes(4 as u64))
 	}
@@ -174,21 +174,21 @@
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	// Storage: Refungible Owned (r:0 w:2)
 	fn transfer_creating_removing() -> Weight {
-		Weight::from_ref_time(37_935_000 as u64)
+		Weight::from_ref_time(38_102_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 			.saturating_add(T::DbWeight::get().writes(6 as u64))
 	}
 	// Storage: Refungible Balance (r:1 w:0)
 	// Storage: Refungible Allowance (r:0 w:1)
 	fn approve() -> Weight {
-		Weight::from_ref_time(23_900_000 as u64)
+		Weight::from_ref_time(24_217_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Refungible Balance (r:1 w:0)
 	// Storage: Refungible Allowance (r:0 w:1)
 	fn approve_from() -> Weight {
-		Weight::from_ref_time(24_012_000 as u64)
+		Weight::from_ref_time(24_173_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
@@ -196,7 +196,7 @@
 	// Storage: Refungible Balance (r:2 w:2)
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	fn transfer_from_normal() -> Weight {
-		Weight::from_ref_time(40_384_000 as u64)
+		Weight::from_ref_time(40_040_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(4 as u64))
 			.saturating_add(T::DbWeight::get().writes(3 as u64))
 	}
@@ -206,7 +206,7 @@
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	// Storage: Refungible Owned (r:0 w:1)
 	fn transfer_from_creating() -> Weight {
-		Weight::from_ref_time(43_372_000 as u64)
+		Weight::from_ref_time(42_906_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 			.saturating_add(T::DbWeight::get().writes(5 as u64))
 	}
@@ -216,7 +216,7 @@
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	// Storage: Refungible Owned (r:0 w:1)
 	fn transfer_from_removing() -> Weight {
-		Weight::from_ref_time(46_470_000 as u64)
+		Weight::from_ref_time(46_112_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 			.saturating_add(T::DbWeight::get().writes(5 as u64))
 	}
@@ -226,7 +226,7 @@
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	// Storage: Refungible Owned (r:0 w:2)
 	fn transfer_from_creating_removing() -> Weight {
-		Weight::from_ref_time(46_394_000 as u64)
+		Weight::from_ref_time(45_102_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(6 as u64))
 			.saturating_add(T::DbWeight::get().writes(7 as u64))
 	}
@@ -238,61 +238,61 @@
 	// Storage: Refungible Owned (r:0 w:1)
 	// Storage: Refungible TokenProperties (r:0 w:1)
 	fn burn_from() -> Weight {
-		Weight::from_ref_time(51_957_000 as u64)
+		Weight::from_ref_time(50_573_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 			.saturating_add(T::DbWeight::get().writes(7 as u64))
 	}
 	// Storage: Common CollectionPropertyPermissions (r:1 w:1)
 	fn set_token_property_permissions(b: u32, ) -> Weight {
-		Weight::from_ref_time(5_257_000 as u64)
-			// Standard Error: 47_229
-			.saturating_add(Weight::from_ref_time(12_976_974 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(5_349_000 as u64)
+			// Standard Error: 41_409
+			.saturating_add(Weight::from_ref_time(12_216_721 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Refungible TokenProperties (r:1 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:1 w:0)
 	fn set_token_properties(b: u32, ) -> Weight {
-		Weight::from_ref_time(13_103_140 as u64)
-			// Standard Error: 62_508
-			.saturating_add(Weight::from_ref_time(6_883_577 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(12_947_117 as u64)
+			// Standard Error: 75_487
+			.saturating_add(Weight::from_ref_time(6_809_149 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Refungible TokenProperties (r:1 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:1 w:0)
 	fn delete_token_properties(b: u32, ) -> Weight {
-		Weight::from_ref_time(15_068_000 as u64)
-			// Standard Error: 70_494
-			.saturating_add(Weight::from_ref_time(22_758_838 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(14_967_000 as u64)
+			// Standard Error: 66_400
+			.saturating_add(Weight::from_ref_time(22_261_821 as u64).saturating_mul(b as u64))
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Refungible TotalSupply (r:1 w:1)
 	// Storage: Refungible Balance (r:1 w:1)
 	fn repartition_item() -> Weight {
-		Weight::from_ref_time(24_640_000 as u64)
+		Weight::from_ref_time(25_823_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
 	// Storage: Refungible Balance (r:2 w:0)
 	fn token_owner() -> Weight {
-		Weight::from_ref_time(9_634_000 as u64)
+		Weight::from_ref_time(9_445_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 	}
 	// Storage: Refungible CollectionAllowance (r:0 w:1)
 	fn set_allowance_for_all() -> Weight {
-		Weight::from_ref_time(17_366_000 as u64)
+		Weight::from_ref_time(17_303_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Refungible CollectionAllowance (r:1 w:0)
 	fn allowance_for_all() -> Weight {
-		Weight::from_ref_time(5_419_000 as u64)
+		Weight::from_ref_time(5_352_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 	}
 	// Storage: Refungible TokenProperties (r:1 w:1)
 	fn repair_item() -> Weight {
-		Weight::from_ref_time(7_196_000 as u64)
+		Weight::from_ref_time(7_200_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
@@ -308,7 +308,7 @@
 	// Storage: Refungible TotalSupply (r:0 w:1)
 	// Storage: Refungible Owned (r:0 w:1)
 	fn create_item() -> Weight {
-		Weight::from_ref_time(39_775_000 as u64)
+		Weight::from_ref_time(39_971_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(4 as u64))
 			.saturating_add(RocksDbWeight::get().writes(6 as u64))
 	}
@@ -320,9 +320,9 @@
 	// Storage: Refungible TotalSupply (r:0 w:4)
 	// Storage: Refungible Owned (r:0 w:4)
 	fn create_multiple_items(b: u32, ) -> Weight {
-		Weight::from_ref_time(19_486_095 as u64)
-			// Standard Error: 8_015
-			.saturating_add(Weight::from_ref_time(9_037_181 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(14_049_866 as u64)
+			// Standard Error: 4_015
+			.saturating_add(Weight::from_ref_time(8_984_911 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(3 as u64))
 			.saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(b as u64)))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
@@ -336,9 +336,9 @@
 	// Storage: Refungible TotalSupply (r:0 w:4)
 	// Storage: Refungible Owned (r:0 w:4)
 	fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {
-		Weight::from_ref_time(14_091_538 as u64)
-			// Standard Error: 6_448
-			.saturating_add(Weight::from_ref_time(10_777_780 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(14_893_679 as u64)
+			// Standard Error: 3_571
+			.saturating_add(Weight::from_ref_time(10_611_135 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(b as u64)))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
@@ -352,9 +352,9 @@
 	// Storage: Refungible Balance (r:0 w:4)
 	// Storage: Refungible Owned (r:0 w:4)
 	fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {
-		Weight::from_ref_time(30_958_687 as u64)
-			// Standard Error: 3_000
-			.saturating_add(Weight::from_ref_time(5_976_114 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(31_075_923 as u64)
+			// Standard Error: 2_118
+			.saturating_add(Weight::from_ref_time(5_829_866 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(3 as u64))
 			.saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(b as u64)))
 			.saturating_add(RocksDbWeight::get().writes(3 as u64))
@@ -365,7 +365,7 @@
 	// Storage: Refungible AccountBalance (r:1 w:1)
 	// Storage: Refungible Owned (r:0 w:1)
 	fn burn_item_partial() -> Weight {
-		Weight::from_ref_time(46_498_000 as u64)
+		Weight::from_ref_time(47_369_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(5 as u64))
 			.saturating_add(RocksDbWeight::get().writes(4 as u64))
 	}
@@ -376,14 +376,14 @@
 	// Storage: Refungible Owned (r:0 w:1)
 	// Storage: Refungible TokenProperties (r:0 w:1)
 	fn burn_item_fully() -> Weight {
-		Weight::from_ref_time(42_429_000 as u64)
+		Weight::from_ref_time(41_351_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(4 as u64))
 			.saturating_add(RocksDbWeight::get().writes(6 as u64))
 	}
 	// Storage: Refungible Balance (r:2 w:2)
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	fn transfer_normal() -> Weight {
-		Weight::from_ref_time(31_435_000 as u64)
+		Weight::from_ref_time(31_379_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(3 as u64))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
 	}
@@ -392,7 +392,7 @@
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	// Storage: Refungible Owned (r:0 w:1)
 	fn transfer_creating() -> Weight {
-		Weight::from_ref_time(34_913_000 as u64)
+		Weight::from_ref_time(34_829_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(4 as u64))
 			.saturating_add(RocksDbWeight::get().writes(4 as u64))
 	}
@@ -401,7 +401,7 @@
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	// Storage: Refungible Owned (r:0 w:1)
 	fn transfer_removing() -> Weight {
-		Weight::from_ref_time(37_992_000 as u64)
+		Weight::from_ref_time(38_221_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(4 as u64))
 			.saturating_add(RocksDbWeight::get().writes(4 as u64))
 	}
@@ -410,21 +410,21 @@
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	// Storage: Refungible Owned (r:0 w:2)
 	fn transfer_creating_removing() -> Weight {
-		Weight::from_ref_time(37_935_000 as u64)
+		Weight::from_ref_time(38_102_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(5 as u64))
 			.saturating_add(RocksDbWeight::get().writes(6 as u64))
 	}
 	// Storage: Refungible Balance (r:1 w:0)
 	// Storage: Refungible Allowance (r:0 w:1)
 	fn approve() -> Weight {
-		Weight::from_ref_time(23_900_000 as u64)
+		Weight::from_ref_time(24_217_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Refungible Balance (r:1 w:0)
 	// Storage: Refungible Allowance (r:0 w:1)
 	fn approve_from() -> Weight {
-		Weight::from_ref_time(24_012_000 as u64)
+		Weight::from_ref_time(24_173_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
@@ -432,7 +432,7 @@
 	// Storage: Refungible Balance (r:2 w:2)
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	fn transfer_from_normal() -> Weight {
-		Weight::from_ref_time(40_384_000 as u64)
+		Weight::from_ref_time(40_040_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(4 as u64))
 			.saturating_add(RocksDbWeight::get().writes(3 as u64))
 	}
@@ -442,7 +442,7 @@
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	// Storage: Refungible Owned (r:0 w:1)
 	fn transfer_from_creating() -> Weight {
-		Weight::from_ref_time(43_372_000 as u64)
+		Weight::from_ref_time(42_906_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(5 as u64))
 			.saturating_add(RocksDbWeight::get().writes(5 as u64))
 	}
@@ -452,7 +452,7 @@
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	// Storage: Refungible Owned (r:0 w:1)
 	fn transfer_from_removing() -> Weight {
-		Weight::from_ref_time(46_470_000 as u64)
+		Weight::from_ref_time(46_112_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(5 as u64))
 			.saturating_add(RocksDbWeight::get().writes(5 as u64))
 	}
@@ -462,7 +462,7 @@
 	// Storage: Refungible TotalSupply (r:1 w:0)
 	// Storage: Refungible Owned (r:0 w:2)
 	fn transfer_from_creating_removing() -> Weight {
-		Weight::from_ref_time(46_394_000 as u64)
+		Weight::from_ref_time(45_102_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(6 as u64))
 			.saturating_add(RocksDbWeight::get().writes(7 as u64))
 	}
@@ -474,61 +474,61 @@
 	// Storage: Refungible Owned (r:0 w:1)
 	// Storage: Refungible TokenProperties (r:0 w:1)
 	fn burn_from() -> Weight {
-		Weight::from_ref_time(51_957_000 as u64)
+		Weight::from_ref_time(50_573_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(5 as u64))
 			.saturating_add(RocksDbWeight::get().writes(7 as u64))
 	}
 	// Storage: Common CollectionPropertyPermissions (r:1 w:1)
 	fn set_token_property_permissions(b: u32, ) -> Weight {
-		Weight::from_ref_time(5_257_000 as u64)
-			// Standard Error: 47_229
-			.saturating_add(Weight::from_ref_time(12_976_974 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(5_349_000 as u64)
+			// Standard Error: 41_409
+			.saturating_add(Weight::from_ref_time(12_216_721 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Refungible TokenProperties (r:1 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:1 w:0)
 	fn set_token_properties(b: u32, ) -> Weight {
-		Weight::from_ref_time(13_103_140 as u64)
-			// Standard Error: 62_508
-			.saturating_add(Weight::from_ref_time(6_883_577 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(12_947_117 as u64)
+			// Standard Error: 75_487
+			.saturating_add(Weight::from_ref_time(6_809_149 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Refungible TokenProperties (r:1 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:1 w:0)
 	fn delete_token_properties(b: u32, ) -> Weight {
-		Weight::from_ref_time(15_068_000 as u64)
-			// Standard Error: 70_494
-			.saturating_add(Weight::from_ref_time(22_758_838 as u64).saturating_mul(b as u64))
+		Weight::from_ref_time(14_967_000 as u64)
+			// Standard Error: 66_400
+			.saturating_add(Weight::from_ref_time(22_261_821 as u64).saturating_mul(b as u64))
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Refungible TotalSupply (r:1 w:1)
 	// Storage: Refungible Balance (r:1 w:1)
 	fn repartition_item() -> Weight {
-		Weight::from_ref_time(24_640_000 as u64)
+		Weight::from_ref_time(25_823_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
 	}
 	// Storage: Refungible Balance (r:2 w:0)
 	fn token_owner() -> Weight {
-		Weight::from_ref_time(9_634_000 as u64)
+		Weight::from_ref_time(9_445_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 	}
 	// Storage: Refungible CollectionAllowance (r:0 w:1)
 	fn set_allowance_for_all() -> Weight {
-		Weight::from_ref_time(17_366_000 as u64)
+		Weight::from_ref_time(17_303_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Refungible CollectionAllowance (r:1 w:0)
 	fn allowance_for_all() -> Weight {
-		Weight::from_ref_time(5_419_000 as u64)
+		Weight::from_ref_time(5_352_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 	}
 	// Storage: Refungible TokenProperties (r:1 w:1)
 	fn repair_item() -> Weight {
-		Weight::from_ref_time(7_196_000 as u64)
+		Weight::from_ref_time(7_200_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
--- a/pallets/structure/src/weights.rs
+++ b/pallets/structure/src/weights.rs
@@ -3,7 +3,7 @@
 //! Autogenerated weights for pallet_structure
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-29, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
 
 // Executed Command:
@@ -43,7 +43,7 @@
 	// Storage: Common CollectionById (r:1 w:0)
 	// Storage: Nonfungible TokenData (r:1 w:0)
 	fn find_parent() -> Weight {
-		Weight::from_ref_time(11_766_000 as u64)
+		Weight::from_ref_time(11_663_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 	}
 }
@@ -53,7 +53,7 @@
 	// Storage: Common CollectionById (r:1 w:0)
 	// Storage: Nonfungible TokenData (r:1 w:0)
 	fn find_parent() -> Weight {
-		Weight::from_ref_time(11_766_000 as u64)
+		Weight::from_ref_time(11_663_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 	}
 }
--- a/pallets/unique/src/weights.rs
+++ b/pallets/unique/src/weights.rs
@@ -3,7 +3,7 @@
 //! Autogenerated weights for pallet_unique
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-29, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
 
 // Executed Command:
@@ -59,7 +59,7 @@
 	// Storage: Common CollectionProperties (r:0 w:1)
 	// Storage: Common CollectionById (r:0 w:1)
 	fn create_collection() -> Weight {
-		Weight::from_ref_time(43_527_000 as u64)
+		Weight::from_ref_time(47_681_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(4 as u64))
 			.saturating_add(T::DbWeight::get().writes(6 as u64))
 	}
@@ -71,27 +71,27 @@
 	// Storage: Common AdminAmount (r:0 w:1)
 	// Storage: Common CollectionProperties (r:0 w:1)
 	fn destroy_collection() -> Weight {
-		Weight::from_ref_time(59_528_000 as u64)
+		Weight::from_ref_time(58_371_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(3 as u64))
 			.saturating_add(T::DbWeight::get().writes(6 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:0)
 	// Storage: Common Allowlist (r:0 w:1)
 	fn add_to_allow_list() -> Weight {
-		Weight::from_ref_time(27_970_000 as u64)
+		Weight::from_ref_time(28_197_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:0)
 	// Storage: Common Allowlist (r:0 w:1)
 	fn remove_from_allow_list() -> Weight {
-		Weight::from_ref_time(27_736_000 as u64)
+		Weight::from_ref_time(27_782_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:1)
 	fn change_collection_owner() -> Weight {
-		Weight::from_ref_time(26_991_000 as u64)
+		Weight::from_ref_time(27_100_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
@@ -99,7 +99,7 @@
 	// Storage: Common IsAdmin (r:1 w:1)
 	// Storage: Common AdminAmount (r:1 w:1)
 	fn add_collection_admin() -> Weight {
-		Weight::from_ref_time(30_851_000 as u64)
+		Weight::from_ref_time(31_037_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(3 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
@@ -107,43 +107,43 @@
 	// Storage: Common IsAdmin (r:1 w:1)
 	// Storage: Common AdminAmount (r:1 w:1)
 	fn remove_collection_admin() -> Weight {
-		Weight::from_ref_time(34_432_000 as u64)
+		Weight::from_ref_time(34_543_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(3 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:1)
 	fn set_collection_sponsor() -> Weight {
-		Weight::from_ref_time(26_862_000 as u64)
+		Weight::from_ref_time(27_109_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:1)
 	fn confirm_sponsorship() -> Weight {
-		Weight::from_ref_time(26_711_000 as u64)
+		Weight::from_ref_time(26_916_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:1)
 	fn remove_collection_sponsor() -> Weight {
-		Weight::from_ref_time(38_546_000 as u64)
+		Weight::from_ref_time(29_279_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:1)
 	fn set_transfers_enabled_flag() -> Weight {
-		Weight::from_ref_time(13_251_000 as u64)
+		Weight::from_ref_time(13_064_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:1)
 	fn set_collection_limits() -> Weight {
-		Weight::from_ref_time(27_754_000 as u64)
+		Weight::from_ref_time(27_442_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionProperties (r:1 w:1)
 	fn force_repair_collection() -> Weight {
-		Weight::from_ref_time(10_871_000 as u64)
+		Weight::from_ref_time(10_730_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
@@ -158,7 +158,7 @@
 	// Storage: Common CollectionProperties (r:0 w:1)
 	// Storage: Common CollectionById (r:0 w:1)
 	fn create_collection() -> Weight {
-		Weight::from_ref_time(43_527_000 as u64)
+		Weight::from_ref_time(47_681_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(4 as u64))
 			.saturating_add(RocksDbWeight::get().writes(6 as u64))
 	}
@@ -170,27 +170,27 @@
 	// Storage: Common AdminAmount (r:0 w:1)
 	// Storage: Common CollectionProperties (r:0 w:1)
 	fn destroy_collection() -> Weight {
-		Weight::from_ref_time(59_528_000 as u64)
+		Weight::from_ref_time(58_371_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(3 as u64))
 			.saturating_add(RocksDbWeight::get().writes(6 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:0)
 	// Storage: Common Allowlist (r:0 w:1)
 	fn add_to_allow_list() -> Weight {
-		Weight::from_ref_time(27_970_000 as u64)
+		Weight::from_ref_time(28_197_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:0)
 	// Storage: Common Allowlist (r:0 w:1)
 	fn remove_from_allow_list() -> Weight {
-		Weight::from_ref_time(27_736_000 as u64)
+		Weight::from_ref_time(27_782_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:1)
 	fn change_collection_owner() -> Weight {
-		Weight::from_ref_time(26_991_000 as u64)
+		Weight::from_ref_time(27_100_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
@@ -198,7 +198,7 @@
 	// Storage: Common IsAdmin (r:1 w:1)
 	// Storage: Common AdminAmount (r:1 w:1)
 	fn add_collection_admin() -> Weight {
-		Weight::from_ref_time(30_851_000 as u64)
+		Weight::from_ref_time(31_037_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(3 as u64))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
 	}
@@ -206,43 +206,43 @@
 	// Storage: Common IsAdmin (r:1 w:1)
 	// Storage: Common AdminAmount (r:1 w:1)
 	fn remove_collection_admin() -> Weight {
-		Weight::from_ref_time(34_432_000 as u64)
+		Weight::from_ref_time(34_543_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(3 as u64))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:1)
 	fn set_collection_sponsor() -> Weight {
-		Weight::from_ref_time(26_862_000 as u64)
+		Weight::from_ref_time(27_109_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:1)
 	fn confirm_sponsorship() -> Weight {
-		Weight::from_ref_time(26_711_000 as u64)
+		Weight::from_ref_time(26_916_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:1)
 	fn remove_collection_sponsor() -> Weight {
-		Weight::from_ref_time(38_546_000 as u64)
+		Weight::from_ref_time(29_279_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:1)
 	fn set_transfers_enabled_flag() -> Weight {
-		Weight::from_ref_time(13_251_000 as u64)
+		Weight::from_ref_time(13_064_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionById (r:1 w:1)
 	fn set_collection_limits() -> Weight {
-		Weight::from_ref_time(27_754_000 as u64)
+		Weight::from_ref_time(27_442_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Common CollectionProperties (r:1 w:1)
 	fn force_repair_collection() -> Weight {
-		Weight::from_ref_time(10_871_000 as u64)
+		Weight::from_ref_time(10_730_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
--- a/primitives/common/src/constants.rs
+++ b/primitives/common/src/constants.rs
@@ -52,10 +52,10 @@
 pub const SESSION_LENGTH: BlockNumber = HOURS;
 
 // Targeting 0.1 UNQ per transfer
-pub const WEIGHT_TO_FEE_COEFF: u64 = /*<weight2fee>*/77_233_712_036_439_751/*</weight2fee>*/;
+pub const WEIGHT_TO_FEE_COEFF: u64 = /*<weight2fee>*/77_246_728_691_397_557/*</weight2fee>*/;
 
 // Targeting 0.15 UNQ per transfer via ETH
-pub const MIN_GAS_PRICE: u64 = /*<mingasprice>*/1_016_956_047_159/*</mingasprice>*/;
+pub const MIN_GAS_PRICE: u64 = /*<mingasprice>*/1_017_135_340_028/*</mingasprice>*/;
 
 /// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.
 /// This is used to limit the maximal weight of a single extrinsic.
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -54,7 +54,7 @@
 	spec_name: create_runtime_str!(RUNTIME_NAME),
 	impl_name: create_runtime_str!(RUNTIME_NAME),
 	authoring_version: 1,
-	spec_version: 937052,
+	spec_version: 937053,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 3,
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -57,7 +57,7 @@
 	spec_name: create_runtime_str!(RUNTIME_NAME),
 	impl_name: create_runtime_str!(RUNTIME_NAME),
 	authoring_version: 1,
-	spec_version: 937052,
+	spec_version: 937053,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 3,
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -175,7 +175,7 @@
 	'pallet-xcm/try-runtime',
 	'parachain-info/try-runtime',
 ]
-unique-runtime = ['foreign-assets']
+unique-runtime = ['foreign-assets', 'refungible']
 
 collator-selection = []
 foreign-assets = []
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -54,7 +54,7 @@
 	spec_name: create_runtime_str!(RUNTIME_NAME),
 	impl_name: create_runtime_str!(RUNTIME_NAME),
 	authoring_version: 1,
-	spec_version: 937052,
+	spec_version: 937053,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 3,
--- a/tests/src/generateEnv.ts
+++ b/tests/src/generateEnv.ts
@@ -12,6 +12,7 @@
 function setVar(env: string, key: string, value: string): string {
   return env.replace(new RegExp(`${key}=.+?\n`), `${key}=${value}\n`);
 }
+
 // Fetch and format version string
 async function ff(url: string, regex: RegExp, rep: string): Promise<string> {
   const ver = await fetchVersion(url);
@@ -19,6 +20,13 @@
     throw new Error(`bad regex for ${url}`);
   return ver.replace(regex, rep);
 }
+function fixupUnique(version: string): string {
+  if (version === 'release-v930033')
+    return 'release-v930033-fix-gas-price';
+  if (version === 'release-v930034')
+    return 'release-v930034-fix-gas-price';
+  return version;
+}
 
 (async () => {
   let env = (await readFile(join(__dirname, '../../.env'))).toString();
@@ -27,24 +35,24 @@
     ff('wss://statemint-rpc.polkadot.io/', /^(....)$/, 'release-parachains-v$1').then(v => env = setVar(env, 'STATEMINT_BUILD_BRANCH', v)),
     ff('wss://acala-rpc-0.aca-api.network/', /^(.)(..)(.)$/, '$1.$2.$3').then(v => env = setVar(env, 'ACALA_BUILD_BRANCH', v)),
     ff('wss://wss.api.moonbeam.network/', /^(....)$/, 'runtime-$1').then(v => env = setVar(env, 'MOONBEAM_BUILD_BRANCH', v)),
-    ff('wss://ws.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'UNIQUE_MAINNET_BRANCH', v)),
+    ff('wss://ws.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'UNIQUE_MAINNET_BRANCH', fixupUnique(v))),
 
     ff('wss://kusama-rpc.polkadot.io/', /^(.)(..)(.)$/, 'release-v0.$1.$2').then(v => env = setVar(env, 'KUSAMA_MAINNET_BRANCH', v)),
     ff('wss://statemine-rpc.polkadot.io/', /^(....)$/, 'release-parachains-v$1').then(v => env = setVar(env, 'STATEMINE_BUILD_BRANCH', v)),
     ff('wss://karura-rpc-0.aca-api.network/', /^(.)(..)(.)$/, 'release-karura-$1.$2.$3').then(v => env = setVar(env, 'KARURA_BUILD_BRANCH', v)),
     ff('wss://wss.api.moonriver.moonbeam.network/', /^(....)$/, 'runtime-$1').then(v => env = setVar(env, 'MOONRIVER_BUILD_BRANCH', v)),
-    ff('wss://ws-quartz.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'QUARTZ_MAINNET_BRANCH', v)),
+    ff('wss://ws-quartz.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'QUARTZ_MAINNET_BRANCH', fixupUnique(v))),
 
-    ff('wss://westend-rpc.polkadot.io/', /^(.)(..)(.)$/, 'release-v0.$1.$2').then(v => env = setVar(env, 'UNIQUEWEST_MAINNET_BRANCH', v)),
+    ff('wss://ws-westend.unique.network/', /^(.)(..)(.)$/, 'release-v0.$1.$2').then(v => env = setVar(env, 'UNIQUEWEST_MAINNET_BRANCH', v)),
     ff('wss://westmint-rpc.polkadot.io/', /^(....)$/, 'parachains-v$1').then(v => env = setVar(env, 'WESTMINT_BUILD_BRANCH', v)),
-    ff('wss://ws-opal.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'OPAL_MAINNET_BRANCH', v)),
+    ff('wss://ws-opal.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'OPAL_MAINNET_BRANCH', fixupUnique(v))),
 
     ff('wss://ws-eastend.unique.network/', /^(.)(..)(.)$/, 'release-v0.$1.$2').then(v => env = setVar(env, 'UNIQUEEAST_MAINNET_BRANCH', v)),
-    ff('wss://ws-sapphire.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'SAPPHIRE_MAINNET_BRANCH', v)),
+    ff('wss://ws-sapphire.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'SAPPHIRE_MAINNET_BRANCH', fixupUnique(v))),
   ]);
   console.log(env);
-  process.exit(0);
 })().catch(e => {
+  console.error('Fatal');
   console.error(e.stack);
   process.exit(1);
 });
--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -85,7 +85,10 @@
         );
       } else if (chain.eq('UNIQUE')) {
         // Insert Unique additional pallets here
-        requiredPallets.push(foreignAssets);
+        requiredPallets.push(
+          refungible,
+          foreignAssets,
+        );
       }
     });
   });