diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index 6bd7d7548c637..8c307ff90924d 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -18,25 +18,26 @@
 //! Autogenerated weights for pallet_balances
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-24, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/substrate
+// target/production/substrate
 // benchmark
 // pallet
-// --chain=dev
 // --steps=50
 // --repeat=20
-// --pallet=pallet_balances
 // --extrinsic=*
 // --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --output=./frame/balances/src/weights.rs
+// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/substrate/.git/.artifacts/bench.json
+// --pallet=pallet_balances
+// --chain=dev
 // --header=./HEADER-APACHE2
+// --output=./frame/balances/src/weights.rs
 // --template=./.maintain/frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
@@ -64,10 +65,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1723`
-		//  Estimated: `2603`
-		// Minimum execution time: 47_557 nanoseconds.
-		Weight::from_parts(48_314_000, 2603)
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 37_815 nanoseconds.
+		Weight::from_ref_time(38_109_000)
+			.saturating_add(Weight::from_proof_size(3593))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -75,10 +77,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn transfer_keep_alive() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1607`
-		//  Estimated: `2603`
-		// Minimum execution time: 36_372 nanoseconds.
-		Weight::from_parts(37_432_000, 2603)
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 28_184 nanoseconds.
+		Weight::from_ref_time(49_250_000)
+			.saturating_add(Weight::from_proof_size(3593))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -86,10 +89,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn set_balance_creating() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1757`
-		//  Estimated: `2603`
-		// Minimum execution time: 26_671 nanoseconds.
-		Weight::from_parts(28_287_000, 2603)
+		//  Measured:  `206`
+		//  Estimated: `3593`
+		// Minimum execution time: 17_474 nanoseconds.
+		Weight::from_ref_time(17_777_000)
+			.saturating_add(Weight::from_proof_size(3593))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -97,10 +101,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn set_balance_killing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1757`
-		//  Estimated: `2603`
-		// Minimum execution time: 30_122 nanoseconds.
-		Weight::from_parts(30_615_000, 2603)
+		//  Measured:  `206`
+		//  Estimated: `3593`
+		// Minimum execution time: 20_962 nanoseconds.
+		Weight::from_ref_time(21_419_000)
+			.saturating_add(Weight::from_proof_size(3593))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -108,10 +113,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn force_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1719`
-		//  Estimated: `5206`
-		// Minimum execution time: 47_891 nanoseconds.
-		Weight::from_parts(48_496_000, 5206)
+		//  Measured:  `135`
+		//  Estimated: `6196`
+		// Minimum execution time: 39_713 nanoseconds.
+		Weight::from_ref_time(40_360_000)
+			.saturating_add(Weight::from_proof_size(6196))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -119,10 +125,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn transfer_all() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1607`
-		//  Estimated: `2603`
-		// Minimum execution time: 42_470 nanoseconds.
-		Weight::from_parts(42_950_000, 2603)
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 34_878 nanoseconds.
+		Weight::from_ref_time(35_121_000)
+			.saturating_add(Weight::from_proof_size(3593))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -130,10 +137,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn force_unreserve() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1641`
-		//  Estimated: `2603`
-		// Minimum execution time: 23_230 nanoseconds.
-		Weight::from_parts(23_951_000, 2603)
+		//  Measured:  `206`
+		//  Estimated: `3593`
+		// Minimum execution time: 16_790 nanoseconds.
+		Weight::from_ref_time(17_029_000)
+			.saturating_add(Weight::from_proof_size(3593))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -145,10 +153,11 @@ impl WeightInfo for () {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1723`
-		//  Estimated: `2603`
-		// Minimum execution time: 47_557 nanoseconds.
-		Weight::from_parts(48_314_000, 2603)
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 37_815 nanoseconds.
+		Weight::from_ref_time(38_109_000)
+			.saturating_add(Weight::from_proof_size(3593))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -156,10 +165,11 @@ impl WeightInfo for () {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn transfer_keep_alive() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1607`
-		//  Estimated: `2603`
-		// Minimum execution time: 36_372 nanoseconds.
-		Weight::from_parts(37_432_000, 2603)
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 28_184 nanoseconds.
+		Weight::from_ref_time(49_250_000)
+			.saturating_add(Weight::from_proof_size(3593))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -167,10 +177,11 @@ impl WeightInfo for () {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn set_balance_creating() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1757`
-		//  Estimated: `2603`
-		// Minimum execution time: 26_671 nanoseconds.
-		Weight::from_parts(28_287_000, 2603)
+		//  Measured:  `206`
+		//  Estimated: `3593`
+		// Minimum execution time: 17_474 nanoseconds.
+		Weight::from_ref_time(17_777_000)
+			.saturating_add(Weight::from_proof_size(3593))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -178,10 +189,11 @@ impl WeightInfo for () {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn set_balance_killing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1757`
-		//  Estimated: `2603`
-		// Minimum execution time: 30_122 nanoseconds.
-		Weight::from_parts(30_615_000, 2603)
+		//  Measured:  `206`
+		//  Estimated: `3593`
+		// Minimum execution time: 20_962 nanoseconds.
+		Weight::from_ref_time(21_419_000)
+			.saturating_add(Weight::from_proof_size(3593))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -189,10 +201,11 @@ impl WeightInfo for () {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn force_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1719`
-		//  Estimated: `5206`
-		// Minimum execution time: 47_891 nanoseconds.
-		Weight::from_parts(48_496_000, 5206)
+		//  Measured:  `135`
+		//  Estimated: `6196`
+		// Minimum execution time: 39_713 nanoseconds.
+		Weight::from_ref_time(40_360_000)
+			.saturating_add(Weight::from_proof_size(6196))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -200,10 +213,11 @@ impl WeightInfo for () {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn transfer_all() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1607`
-		//  Estimated: `2603`
-		// Minimum execution time: 42_470 nanoseconds.
-		Weight::from_parts(42_950_000, 2603)
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 34_878 nanoseconds.
+		Weight::from_ref_time(35_121_000)
+			.saturating_add(Weight::from_proof_size(3593))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -211,10 +225,11 @@ impl WeightInfo for () {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn force_unreserve() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1641`
-		//  Estimated: `2603`
-		// Minimum execution time: 23_230 nanoseconds.
-		Weight::from_parts(23_951_000, 2603)
+		//  Measured:  `206`
+		//  Estimated: `3593`
+		// Minimum execution time: 16_790 nanoseconds.
+		Weight::from_ref_time(17_029_000)
+			.saturating_add(Weight::from_proof_size(3593))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/frame/benchmarking/pov/src/benchmarking.rs b/frame/benchmarking/pov/src/benchmarking.rs
index 331570ad28fce..ebe9b241416ad 100644
--- a/frame/benchmarking/pov/src/benchmarking.rs
+++ b/frame/benchmarking/pov/src/benchmarking.rs
@@ -39,6 +39,17 @@ frame_benchmarking::benchmarks! {
 		assert_eq!(Value::<T>::get(), Some(123));
 	}
 
+	#[pov_mode = MaxEncodedLen {
+		Pov::Value2: Ignored
+	}]
+	storage_single_value_ignored_some_read {
+		Value::<T>::put(123);
+		Value2::<T>::put(123);
+	}: {
+		assert_eq!(Value::<T>::get(), Some(123));
+		assert_eq!(Value2::<T>::get(), Some(123));
+	}
+
 	storage_single_value_read_twice {
 		Value::<T>::put(123);
 	}: {
diff --git a/frame/benchmarking/pov/src/weights.rs b/frame/benchmarking/pov/src/weights.rs
index e890e9b2ef88a..948d268cf7a4b 100644
--- a/frame/benchmarking/pov/src/weights.rs
+++ b/frame/benchmarking/pov/src/weights.rs
@@ -2,9 +2,9 @@
 //! Autogenerated weights for frame_benchmarking_pallet_pov
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-23, STEPS: `50`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `oty-parity`, CPU: `11th Gen Intel(R) Core(TM) i7-1165G7 @ 2.80GHz`
+//! HOSTNAME: `i9`, CPU: `13th Gen Intel(R) Core(TM) i9-13900K`
 //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
 
 // Executed Command:
@@ -19,7 +19,7 @@
 // --steps
 // 50
 // --repeat
-// 1
+// 20
 // --template=.maintain/frame-weight-template.hbs
 // --output=frame/benchmarking/pov/src/weights.rs
 
@@ -71,9 +71,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_single_value_read() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `136`
-		//  Estimated: `499`
-		// Minimum execution time: 3_291 nanoseconds.
-		Weight::from_parts(3_291_000, 499)
+		//  Estimated: `1489`
+		// Minimum execution time: 1_968 nanoseconds.
+		Weight::from_ref_time(2_060_000)
+			.saturating_add(Weight::from_proof_size(1489))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Value (r:1 w:0)
@@ -82,8 +83,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `136`
 		//  Estimated: `0`
-		// Minimum execution time: 2_918 nanoseconds.
-		Weight::from_ref_time(2_918_000)
+		// Minimum execution time: 1_934 nanoseconds.
+		Weight::from_ref_time(2_092_000)
+			.saturating_add(Weight::from_proof_size(0))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Value (r:1 w:0)
@@ -93,9 +95,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_single_value_ignored_some_read() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `160`
-		//  Estimated: `659`
-		// Minimum execution time: 4_056 nanoseconds.
-		Weight::from_parts(4_056_000, 659)
+		//  Estimated: `1649`
+		// Minimum execution time: 2_605 nanoseconds.
+		Weight::from_ref_time(2_786_000)
+			.saturating_add(Weight::from_proof_size(1649))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// Storage: Pov Value (r:1 w:0)
@@ -103,9 +106,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_single_value_read_twice() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `136`
-		//  Estimated: `499`
-		// Minimum execution time: 3_552 nanoseconds.
-		Weight::from_parts(3_552_000, 499)
+		//  Estimated: `1489`
+		// Minimum execution time: 2_019 nanoseconds.
+		Weight::from_ref_time(2_214_000)
+			.saturating_add(Weight::from_proof_size(1489))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Value (r:0 w:1)
@@ -114,8 +118,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 795 nanoseconds.
-		Weight::from_ref_time(795_000)
+		// Minimum execution time: 279 nanoseconds.
+		Weight::from_ref_time(357_000)
+			.saturating_add(Weight::from_proof_size(0))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: Pov Value (r:0 w:1)
@@ -124,8 +129,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 865 nanoseconds.
-		Weight::from_ref_time(865_000)
+		// Minimum execution time: 291 nanoseconds.
+		Weight::from_ref_time(378_000)
+			.saturating_add(Weight::from_proof_size(0))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: Pov Map1M (r:1 w:0)
@@ -133,9 +139,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_1m_map_read_one_value_two_additional_layers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1275`
-		//  Estimated: `3750`
-		// Minimum execution time: 9_571 nanoseconds.
-		Weight::from_parts(9_571_000, 3750)
+		//  Estimated: `4740`
+		// Minimum execution time: 5_077 nanoseconds.
+		Weight::from_ref_time(5_400_000)
+			.saturating_add(Weight::from_proof_size(4740))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Map1M (r:1 w:0)
@@ -143,9 +150,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_1m_map_read_one_value_three_additional_layers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1544`
-		//  Estimated: `4019`
-		// Minimum execution time: 14_597 nanoseconds.
-		Weight::from_parts(14_597_000, 4019)
+		//  Estimated: `5009`
+		// Minimum execution time: 5_878 nanoseconds.
+		Weight::from_ref_time(6_239_000)
+			.saturating_add(Weight::from_proof_size(5009))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Map1M (r:1 w:0)
@@ -153,9 +161,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_1m_map_read_one_value_four_additional_layers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2044`
-		//  Estimated: `4519`
-		// Minimum execution time: 19_793 nanoseconds.
-		Weight::from_parts(19_793_000, 4519)
+		//  Estimated: `5509`
+		// Minimum execution time: 7_282 nanoseconds.
+		Weight::from_ref_time(8_022_000)
+			.saturating_add(Weight::from_proof_size(5509))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Map1M (r:100 w:0)
@@ -167,13 +176,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_map_read_per_component(n: u32, m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `515 + n * (188 ±0) + m * (188 ±0)`
-		//  Estimated: `0 + n * (3006 ±0) + m * (2511 ±0)`
-		// Minimum execution time: 266_160 nanoseconds.
-		Weight::from_ref_time(190_477_747)
-			// Standard Error: 96_405
-			.saturating_add(Weight::from_ref_time(1_049_993).saturating_mul(n.into()))
-			// Standard Error: 96_405
-			.saturating_add(Weight::from_ref_time(1_202_546).saturating_mul(m.into()))
+		//  Estimated: `1980 + n * (3006 ±0) + m * (2511 ±0)`
+		// Minimum execution time: 195_406 nanoseconds.
+		Weight::from_ref_time(129_093_464)
+			.saturating_add(Weight::from_proof_size(1980))
+			// Standard Error: 12_134
+			.saturating_add(Weight::from_ref_time(855_330).saturating_mul(n.into()))
+			// Standard Error: 12_134
+			.saturating_add(Weight::from_ref_time(870_523).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(m.into())))
 			.saturating_add(Weight::from_proof_size(3006).saturating_mul(n.into()))
@@ -188,13 +198,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_map_read_per_component_one_ignored(n: u32, m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `515 + n * (188 ±0) + m * (188 ±0)`
-		//  Estimated: `695 + n * (3195 ±2) + m * (189 ±2)`
-		// Minimum execution time: 265_113 nanoseconds.
-		Weight::from_parts(215_943_973, 695)
-			// Standard Error: 199_907
-			.saturating_add(Weight::from_ref_time(988_371).saturating_mul(n.into()))
-			// Standard Error: 199_907
-			.saturating_add(Weight::from_ref_time(1_145_693).saturating_mul(m.into()))
+		//  Estimated: `1685 + n * (3195 ±0) + m * (189 ±0)`
+		// Minimum execution time: 195_053 nanoseconds.
+		Weight::from_ref_time(131_322_479)
+			.saturating_add(Weight::from_proof_size(1685))
+			// Standard Error: 12_161
+			.saturating_add(Weight::from_ref_time(843_047).saturating_mul(n.into()))
+			// Standard Error: 12_161
+			.saturating_add(Weight::from_ref_time(858_668).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(m.into())))
 			.saturating_add(Weight::from_proof_size(3195).saturating_mul(n.into()))
@@ -206,11 +217,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_1m_map_one_entry_repeated_read(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `170`
-		//  Estimated: `2511`
-		// Minimum execution time: 119 nanoseconds.
-		Weight::from_parts(3_649_405, 2511)
-			// Standard Error: 4_472
-			.saturating_add(Weight::from_ref_time(432_147).saturating_mul(n.into()))
+		//  Estimated: `3501`
+		// Minimum execution time: 22 nanoseconds.
+		Weight::from_ref_time(2_334_945)
+			.saturating_add(Weight::from_proof_size(3501))
+			// Standard Error: 624
+			.saturating_add(Weight::from_ref_time(282_046).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Map1M (r:100 w:0)
@@ -219,11 +231,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_1m_map_multiple_entry_repeated_read(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `147 + n * (40 ±0)`
-		//  Estimated: `0 + n * (2511 ±0)`
-		// Minimum execution time: 106 nanoseconds.
-		Weight::from_ref_time(59_892_609)
-			// Standard Error: 418_004
-			.saturating_add(Weight::from_ref_time(5_919_793).saturating_mul(n.into()))
+		//  Estimated: `990 + n * (2511 ±0)`
+		// Minimum execution time: 20 nanoseconds.
+		Weight::from_ref_time(525_027)
+			.saturating_add(Weight::from_proof_size(990))
+			// Standard Error: 2_767
+			.saturating_add(Weight::from_ref_time(3_887_350).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(Weight::from_proof_size(2511).saturating_mul(n.into()))
 	}
@@ -233,11 +246,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_1m_double_map_read_per_component(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `21938 + n * (57 ±0)`
-		//  Estimated: `0 + n * (2543 ±0)`
-		// Minimum execution time: 550 nanoseconds.
-		Weight::from_ref_time(65_431_603)
-			// Standard Error: 66_935
-			.saturating_add(Weight::from_ref_time(2_825_371).saturating_mul(n.into()))
+		//  Estimated: `990 + n * (2543 ±0)`
+		// Minimum execution time: 34 nanoseconds.
+		Weight::from_ref_time(18_341_393)
+			.saturating_add(Weight::from_proof_size(990))
+			// Standard Error: 1_312
+			.saturating_add(Weight::from_ref_time(2_053_135).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(Weight::from_proof_size(2543).saturating_mul(n.into()))
 	}
@@ -246,9 +260,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_value_bounded_read() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
-		//  Estimated: `528`
-		// Minimum execution time: 2_541 nanoseconds.
-		Weight::from_parts(2_541_000, 528)
+		//  Estimated: `1518`
+		// Minimum execution time: 1_163 nanoseconds.
+		Weight::from_ref_time(1_274_000)
+			.saturating_add(Weight::from_proof_size(1518))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov UnboundedValue (r:1 w:0)
@@ -256,9 +271,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_value_unbounded_read() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
-		//  Estimated: `604`
-		// Minimum execution time: 2_226 nanoseconds.
-		Weight::from_parts(2_226_000, 604)
+		//  Estimated: `1594`
+		// Minimum execution time: 1_167 nanoseconds.
+		Weight::from_ref_time(1_367_000)
+			.saturating_add(Weight::from_proof_size(1594))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov UnboundedValue (r:1 w:0)
@@ -267,8 +283,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `0`
-		// Minimum execution time: 2_100 nanoseconds.
-		Weight::from_ref_time(2_100_000)
+		// Minimum execution time: 1_155 nanoseconds.
+		Weight::from_ref_time(1_248_000)
+			.saturating_add(Weight::from_proof_size(0))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov UnboundedValue (r:1 w:0)
@@ -278,9 +295,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_value_bounded_and_unbounded_read() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
-		//  Estimated: `1132`
-		// Minimum execution time: 2_808 nanoseconds.
-		Weight::from_parts(2_808_000, 1132)
+		//  Estimated: `3112`
+		// Minimum execution time: 1_424 nanoseconds.
+		Weight::from_ref_time(1_601_000)
+			.saturating_add(Weight::from_proof_size(3112))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// Storage: Pov LargeValue (r:1 w:0)
@@ -289,11 +307,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn measured_storage_value_read_linear_size(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `174 + l * (1 ±0)`
-		//  Estimated: `666 + l * (1 ±0)`
-		// Minimum execution time: 3_385 nanoseconds.
-		Weight::from_parts(3_385_000, 666)
-			// Standard Error: 10
-			.saturating_add(Weight::from_ref_time(356).saturating_mul(l.into()))
+		//  Estimated: `1656 + l * (1 ±0)`
+		// Minimum execution time: 1_744 nanoseconds.
+		Weight::from_ref_time(1_800_000)
+			.saturating_add(Weight::from_proof_size(1656))
+			// Standard Error: 4
+			.saturating_add(Weight::from_ref_time(443).saturating_mul(l.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_proof_size(1).saturating_mul(l.into()))
 	}
@@ -303,11 +322,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn mel_storage_value_read_linear_size(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `174 + l * (1 ±0)`
-		//  Estimated: `4194803`
-		// Minimum execution time: 3_342 nanoseconds.
-		Weight::from_parts(3_342_000, 4194803)
+		//  Estimated: `4195793`
+		// Minimum execution time: 1_770 nanoseconds.
+		Weight::from_ref_time(1_813_000)
+			.saturating_add(Weight::from_proof_size(4195793))
 			// Standard Error: 6
-			.saturating_add(Weight::from_ref_time(345).saturating_mul(l.into()))
+			.saturating_add(Weight::from_ref_time(495).saturating_mul(l.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov LargeValue (r:1 w:0)
@@ -318,11 +338,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn measured_storage_double_value_read_linear_size(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `235 + l * (2 ±0)`
-		//  Estimated: `1448 + l * (4 ±0)`
-		// Minimum execution time: 4_519 nanoseconds.
-		Weight::from_parts(4_519_000, 1448)
-			// Standard Error: 9
-			.saturating_add(Weight::from_ref_time(560).saturating_mul(l.into()))
+		//  Estimated: `3428 + l * (4 ±0)`
+		// Minimum execution time: 2_349 nanoseconds.
+		Weight::from_ref_time(2_423_000)
+			.saturating_add(Weight::from_proof_size(3428))
+			// Standard Error: 11
+			.saturating_add(Weight::from_ref_time(950).saturating_mul(l.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_proof_size(4).saturating_mul(l.into()))
 	}
@@ -334,11 +355,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn mel_storage_double_value_read_linear_size(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `235 + l * (2 ±0)`
-		//  Estimated: `8389606`
-		// Minimum execution time: 4_462 nanoseconds.
-		Weight::from_parts(4_462_000, 8389606)
-			// Standard Error: 7
-			.saturating_add(Weight::from_ref_time(538).saturating_mul(l.into()))
+		//  Estimated: `8391586`
+		// Minimum execution time: 2_315 nanoseconds.
+		Weight::from_ref_time(2_409_000)
+			.saturating_add(Weight::from_proof_size(8391586))
+			// Standard Error: 12
+			.saturating_add(Weight::from_ref_time(984).saturating_mul(l.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// Storage: Pov LargeValue (r:1 w:0)
@@ -349,11 +371,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn mel_mixed_storage_double_value_read_linear_size(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `235 + l * (2 ±0)`
-		//  Estimated: `4195527 + l * (2 ±0)`
-		// Minimum execution time: 4_552 nanoseconds.
-		Weight::from_parts(4_552_000, 4195527)
-			// Standard Error: 6
-			.saturating_add(Weight::from_ref_time(507).saturating_mul(l.into()))
+		//  Estimated: `4197507 + l * (2 ±0)`
+		// Minimum execution time: 2_370 nanoseconds.
+		Weight::from_ref_time(2_474_000)
+			.saturating_add(Weight::from_proof_size(4197507))
+			// Standard Error: 11
+			.saturating_add(Weight::from_ref_time(956).saturating_mul(l.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_proof_size(2).saturating_mul(l.into()))
 	}
@@ -365,11 +388,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn measured_mixed_storage_double_value_read_linear_size(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `235 + l * (2 ±0)`
-		//  Estimated: `4195527 + l * (2 ±0)`
-		// Minimum execution time: 4_236 nanoseconds.
-		Weight::from_parts(4_236_000, 4195527)
-			// Standard Error: 8
-			.saturating_add(Weight::from_ref_time(517).saturating_mul(l.into()))
+		//  Estimated: `4197507 + l * (2 ±0)`
+		// Minimum execution time: 2_375 nanoseconds.
+		Weight::from_ref_time(2_420_000)
+			.saturating_add(Weight::from_proof_size(4197507))
+			// Standard Error: 9
+			.saturating_add(Weight::from_ref_time(914).saturating_mul(l.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_proof_size(2).saturating_mul(l.into()))
 	}
@@ -381,11 +405,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_map_unbounded_both_measured_read(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `293 + i * (8 ±0)`
-		//  Estimated: `5524 + i * (16 ±0)`
-		// Minimum execution time: 5_649 nanoseconds.
-		Weight::from_parts(6_111_237, 5524)
-			// Standard Error: 1_060
-			.saturating_add(Weight::from_ref_time(2_693).saturating_mul(i.into()))
+		//  Estimated: `7504 + i * (16 ±0)`
+		// Minimum execution time: 3_305 nanoseconds.
+		Weight::from_ref_time(3_689_335)
+			.saturating_add(Weight::from_proof_size(7504))
+			// Standard Error: 29
+			.saturating_add(Weight::from_ref_time(638).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_proof_size(16).saturating_mul(i.into()))
 	}
@@ -397,9 +422,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_map_partial_unbounded_read(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `260 + i * (4 ±0)`
-		//  Estimated: `5243 + i * (4 ±0)`
-		// Minimum execution time: 5_997 nanoseconds.
-		Weight::from_parts(7_996_508, 5243)
+		//  Estimated: `7223 + i * (4 ±0)`
+		// Minimum execution time: 3_469 nanoseconds.
+		Weight::from_ref_time(3_878_896)
+			.saturating_add(Weight::from_proof_size(7223))
+			// Standard Error: 33
+			.saturating_add(Weight::from_ref_time(356).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_proof_size(4).saturating_mul(i.into()))
 	}
@@ -411,11 +439,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn storage_map_partial_unbounded_ignored_read(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `260 + i * (4 ±0)`
-		//  Estimated: `2768 + i * (4 ±0)`
-		// Minimum execution time: 5_679 nanoseconds.
-		Weight::from_parts(6_496_804, 2768)
-			// Standard Error: 611
-			.saturating_add(Weight::from_ref_time(930).saturating_mul(i.into()))
+		//  Estimated: `3758 + i * (4 ±0)`
+		// Minimum execution time: 3_442 nanoseconds.
+		Weight::from_ref_time(3_881_051)
+			.saturating_add(Weight::from_proof_size(3758))
+			// Standard Error: 35
+			.saturating_add(Weight::from_ref_time(384).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_proof_size(4).saturating_mul(i.into()))
 	}
@@ -423,15 +452,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_087 nanoseconds.
-		Weight::from_ref_time(7_087_000)
+		// Minimum execution time: 1_619 nanoseconds.
+		Weight::from_ref_time(1_728_000)
+			.saturating_add(Weight::from_proof_size(0))
 	}
 	fn noop() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_719 nanoseconds.
-		Weight::from_ref_time(2_719_000)
+		// Minimum execution time: 546 nanoseconds.
+		Weight::from_ref_time(640_000)
+			.saturating_add(Weight::from_proof_size(0))
 	}
 }
 
@@ -442,9 +473,10 @@ impl WeightInfo for () {
 	fn storage_single_value_read() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `136`
-		//  Estimated: `499`
-		// Minimum execution time: 3_291 nanoseconds.
-		Weight::from_parts(3_291_000, 499)
+		//  Estimated: `1489`
+		// Minimum execution time: 1_968 nanoseconds.
+		Weight::from_ref_time(2_060_000)
+			.saturating_add(Weight::from_proof_size(1489))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Value (r:1 w:0)
@@ -453,8 +485,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `136`
 		//  Estimated: `0`
-		// Minimum execution time: 2_918 nanoseconds.
-		Weight::from_ref_time(2_918_000)
+		// Minimum execution time: 1_934 nanoseconds.
+		Weight::from_ref_time(2_092_000)
+			.saturating_add(Weight::from_proof_size(0))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Value (r:1 w:0)
@@ -464,9 +497,10 @@ impl WeightInfo for () {
 	fn storage_single_value_ignored_some_read() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `160`
-		//  Estimated: `659`
-		// Minimum execution time: 4_056 nanoseconds.
-		Weight::from_parts(4_056_000, 659)
+		//  Estimated: `1649`
+		// Minimum execution time: 2_605 nanoseconds.
+		Weight::from_ref_time(2_786_000)
+			.saturating_add(Weight::from_proof_size(1649))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// Storage: Pov Value (r:1 w:0)
@@ -474,9 +508,10 @@ impl WeightInfo for () {
 	fn storage_single_value_read_twice() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `136`
-		//  Estimated: `499`
-		// Minimum execution time: 3_552 nanoseconds.
-		Weight::from_parts(3_552_000, 499)
+		//  Estimated: `1489`
+		// Minimum execution time: 2_019 nanoseconds.
+		Weight::from_ref_time(2_214_000)
+			.saturating_add(Weight::from_proof_size(1489))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Value (r:0 w:1)
@@ -485,8 +520,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 795 nanoseconds.
-		Weight::from_ref_time(795_000)
+		// Minimum execution time: 279 nanoseconds.
+		Weight::from_ref_time(357_000)
+			.saturating_add(Weight::from_proof_size(0))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: Pov Value (r:0 w:1)
@@ -495,8 +531,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 865 nanoseconds.
-		Weight::from_ref_time(865_000)
+		// Minimum execution time: 291 nanoseconds.
+		Weight::from_ref_time(378_000)
+			.saturating_add(Weight::from_proof_size(0))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: Pov Map1M (r:1 w:0)
@@ -504,9 +541,10 @@ impl WeightInfo for () {
 	fn storage_1m_map_read_one_value_two_additional_layers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1275`
-		//  Estimated: `3750`
-		// Minimum execution time: 9_571 nanoseconds.
-		Weight::from_parts(9_571_000, 3750)
+		//  Estimated: `4740`
+		// Minimum execution time: 5_077 nanoseconds.
+		Weight::from_ref_time(5_400_000)
+			.saturating_add(Weight::from_proof_size(4740))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Map1M (r:1 w:0)
@@ -514,9 +552,10 @@ impl WeightInfo for () {
 	fn storage_1m_map_read_one_value_three_additional_layers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1544`
-		//  Estimated: `4019`
-		// Minimum execution time: 14_597 nanoseconds.
-		Weight::from_parts(14_597_000, 4019)
+		//  Estimated: `5009`
+		// Minimum execution time: 5_878 nanoseconds.
+		Weight::from_ref_time(6_239_000)
+			.saturating_add(Weight::from_proof_size(5009))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Map1M (r:1 w:0)
@@ -524,9 +563,10 @@ impl WeightInfo for () {
 	fn storage_1m_map_read_one_value_four_additional_layers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2044`
-		//  Estimated: `4519`
-		// Minimum execution time: 19_793 nanoseconds.
-		Weight::from_parts(19_793_000, 4519)
+		//  Estimated: `5509`
+		// Minimum execution time: 7_282 nanoseconds.
+		Weight::from_ref_time(8_022_000)
+			.saturating_add(Weight::from_proof_size(5509))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Map1M (r:100 w:0)
@@ -538,13 +578,14 @@ impl WeightInfo for () {
 	fn storage_map_read_per_component(n: u32, m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `515 + n * (188 ±0) + m * (188 ±0)`
-		//  Estimated: `0 + n * (3006 ±0) + m * (2511 ±0)`
-		// Minimum execution time: 266_160 nanoseconds.
-		Weight::from_ref_time(190_477_747)
-			// Standard Error: 96_405
-			.saturating_add(Weight::from_ref_time(1_049_993).saturating_mul(n.into()))
-			// Standard Error: 96_405
-			.saturating_add(Weight::from_ref_time(1_202_546).saturating_mul(m.into()))
+		//  Estimated: `1980 + n * (3006 ±0) + m * (2511 ±0)`
+		// Minimum execution time: 195_406 nanoseconds.
+		Weight::from_ref_time(129_093_464)
+			.saturating_add(Weight::from_proof_size(1980))
+			// Standard Error: 12_134
+			.saturating_add(Weight::from_ref_time(855_330).saturating_mul(n.into()))
+			// Standard Error: 12_134
+			.saturating_add(Weight::from_ref_time(870_523).saturating_mul(m.into()))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(m.into())))
 			.saturating_add(Weight::from_proof_size(3006).saturating_mul(n.into()))
@@ -559,13 +600,14 @@ impl WeightInfo for () {
 	fn storage_map_read_per_component_one_ignored(n: u32, m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `515 + n * (188 ±0) + m * (188 ±0)`
-		//  Estimated: `695 + n * (3195 ±2) + m * (189 ±2)`
-		// Minimum execution time: 265_113 nanoseconds.
-		Weight::from_parts(215_943_973, 695)
-			// Standard Error: 199_907
-			.saturating_add(Weight::from_ref_time(988_371).saturating_mul(n.into()))
-			// Standard Error: 199_907
-			.saturating_add(Weight::from_ref_time(1_145_693).saturating_mul(m.into()))
+		//  Estimated: `1685 + n * (3195 ±0) + m * (189 ±0)`
+		// Minimum execution time: 195_053 nanoseconds.
+		Weight::from_ref_time(131_322_479)
+			.saturating_add(Weight::from_proof_size(1685))
+			// Standard Error: 12_161
+			.saturating_add(Weight::from_ref_time(843_047).saturating_mul(n.into()))
+			// Standard Error: 12_161
+			.saturating_add(Weight::from_ref_time(858_668).saturating_mul(m.into()))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(m.into())))
 			.saturating_add(Weight::from_proof_size(3195).saturating_mul(n.into()))
@@ -577,11 +619,12 @@ impl WeightInfo for () {
 	fn storage_1m_map_one_entry_repeated_read(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `170`
-		//  Estimated: `2511`
-		// Minimum execution time: 119 nanoseconds.
-		Weight::from_parts(3_649_405, 2511)
-			// Standard Error: 4_472
-			.saturating_add(Weight::from_ref_time(432_147).saturating_mul(n.into()))
+		//  Estimated: `3501`
+		// Minimum execution time: 22 nanoseconds.
+		Weight::from_ref_time(2_334_945)
+			.saturating_add(Weight::from_proof_size(3501))
+			// Standard Error: 624
+			.saturating_add(Weight::from_ref_time(282_046).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov Map1M (r:100 w:0)
@@ -590,11 +633,12 @@ impl WeightInfo for () {
 	fn storage_1m_map_multiple_entry_repeated_read(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `147 + n * (40 ±0)`
-		//  Estimated: `0 + n * (2511 ±0)`
-		// Minimum execution time: 106 nanoseconds.
-		Weight::from_ref_time(59_892_609)
-			// Standard Error: 418_004
-			.saturating_add(Weight::from_ref_time(5_919_793).saturating_mul(n.into()))
+		//  Estimated: `990 + n * (2511 ±0)`
+		// Minimum execution time: 20 nanoseconds.
+		Weight::from_ref_time(525_027)
+			.saturating_add(Weight::from_proof_size(990))
+			// Standard Error: 2_767
+			.saturating_add(Weight::from_ref_time(3_887_350).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(Weight::from_proof_size(2511).saturating_mul(n.into()))
 	}
@@ -604,11 +648,12 @@ impl WeightInfo for () {
 	fn storage_1m_double_map_read_per_component(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `21938 + n * (57 ±0)`
-		//  Estimated: `0 + n * (2543 ±0)`
-		// Minimum execution time: 550 nanoseconds.
-		Weight::from_ref_time(65_431_603)
-			// Standard Error: 66_935
-			.saturating_add(Weight::from_ref_time(2_825_371).saturating_mul(n.into()))
+		//  Estimated: `990 + n * (2543 ±0)`
+		// Minimum execution time: 34 nanoseconds.
+		Weight::from_ref_time(18_341_393)
+			.saturating_add(Weight::from_proof_size(990))
+			// Standard Error: 1_312
+			.saturating_add(Weight::from_ref_time(2_053_135).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(Weight::from_proof_size(2543).saturating_mul(n.into()))
 	}
@@ -617,9 +662,10 @@ impl WeightInfo for () {
 	fn storage_value_bounded_read() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
-		//  Estimated: `528`
-		// Minimum execution time: 2_541 nanoseconds.
-		Weight::from_parts(2_541_000, 528)
+		//  Estimated: `1518`
+		// Minimum execution time: 1_163 nanoseconds.
+		Weight::from_ref_time(1_274_000)
+			.saturating_add(Weight::from_proof_size(1518))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov UnboundedValue (r:1 w:0)
@@ -627,9 +673,10 @@ impl WeightInfo for () {
 	fn storage_value_unbounded_read() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
-		//  Estimated: `604`
-		// Minimum execution time: 2_226 nanoseconds.
-		Weight::from_parts(2_226_000, 604)
+		//  Estimated: `1594`
+		// Minimum execution time: 1_167 nanoseconds.
+		Weight::from_ref_time(1_367_000)
+			.saturating_add(Weight::from_proof_size(1594))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov UnboundedValue (r:1 w:0)
@@ -638,8 +685,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `0`
-		// Minimum execution time: 2_100 nanoseconds.
-		Weight::from_ref_time(2_100_000)
+		// Minimum execution time: 1_155 nanoseconds.
+		Weight::from_ref_time(1_248_000)
+			.saturating_add(Weight::from_proof_size(0))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov UnboundedValue (r:1 w:0)
@@ -649,9 +697,10 @@ impl WeightInfo for () {
 	fn storage_value_bounded_and_unbounded_read() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
-		//  Estimated: `1132`
-		// Minimum execution time: 2_808 nanoseconds.
-		Weight::from_parts(2_808_000, 1132)
+		//  Estimated: `3112`
+		// Minimum execution time: 1_424 nanoseconds.
+		Weight::from_ref_time(1_601_000)
+			.saturating_add(Weight::from_proof_size(3112))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// Storage: Pov LargeValue (r:1 w:0)
@@ -660,11 +709,12 @@ impl WeightInfo for () {
 	fn measured_storage_value_read_linear_size(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `174 + l * (1 ±0)`
-		//  Estimated: `666 + l * (1 ±0)`
-		// Minimum execution time: 3_385 nanoseconds.
-		Weight::from_parts(3_385_000, 666)
-			// Standard Error: 10
-			.saturating_add(Weight::from_ref_time(356).saturating_mul(l.into()))
+		//  Estimated: `1656 + l * (1 ±0)`
+		// Minimum execution time: 1_744 nanoseconds.
+		Weight::from_ref_time(1_800_000)
+			.saturating_add(Weight::from_proof_size(1656))
+			// Standard Error: 4
+			.saturating_add(Weight::from_ref_time(443).saturating_mul(l.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_proof_size(1).saturating_mul(l.into()))
 	}
@@ -674,11 +724,12 @@ impl WeightInfo for () {
 	fn mel_storage_value_read_linear_size(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `174 + l * (1 ±0)`
-		//  Estimated: `4194803`
-		// Minimum execution time: 3_342 nanoseconds.
-		Weight::from_parts(3_342_000, 4194803)
+		//  Estimated: `4195793`
+		// Minimum execution time: 1_770 nanoseconds.
+		Weight::from_ref_time(1_813_000)
+			.saturating_add(Weight::from_proof_size(4195793))
 			// Standard Error: 6
-			.saturating_add(Weight::from_ref_time(345).saturating_mul(l.into()))
+			.saturating_add(Weight::from_ref_time(495).saturating_mul(l.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: Pov LargeValue (r:1 w:0)
@@ -689,11 +740,12 @@ impl WeightInfo for () {
 	fn measured_storage_double_value_read_linear_size(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `235 + l * (2 ±0)`
-		//  Estimated: `1448 + l * (4 ±0)`
-		// Minimum execution time: 4_519 nanoseconds.
-		Weight::from_parts(4_519_000, 1448)
-			// Standard Error: 9
-			.saturating_add(Weight::from_ref_time(560).saturating_mul(l.into()))
+		//  Estimated: `3428 + l * (4 ±0)`
+		// Minimum execution time: 2_349 nanoseconds.
+		Weight::from_ref_time(2_423_000)
+			.saturating_add(Weight::from_proof_size(3428))
+			// Standard Error: 11
+			.saturating_add(Weight::from_ref_time(950).saturating_mul(l.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_proof_size(4).saturating_mul(l.into()))
 	}
@@ -705,11 +757,12 @@ impl WeightInfo for () {
 	fn mel_storage_double_value_read_linear_size(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `235 + l * (2 ±0)`
-		//  Estimated: `8389606`
-		// Minimum execution time: 4_462 nanoseconds.
-		Weight::from_parts(4_462_000, 8389606)
-			// Standard Error: 7
-			.saturating_add(Weight::from_ref_time(538).saturating_mul(l.into()))
+		//  Estimated: `8391586`
+		// Minimum execution time: 2_315 nanoseconds.
+		Weight::from_ref_time(2_409_000)
+			.saturating_add(Weight::from_proof_size(8391586))
+			// Standard Error: 12
+			.saturating_add(Weight::from_ref_time(984).saturating_mul(l.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// Storage: Pov LargeValue (r:1 w:0)
@@ -720,11 +773,12 @@ impl WeightInfo for () {
 	fn mel_mixed_storage_double_value_read_linear_size(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `235 + l * (2 ±0)`
-		//  Estimated: `4195527 + l * (2 ±0)`
-		// Minimum execution time: 4_552 nanoseconds.
-		Weight::from_parts(4_552_000, 4195527)
-			// Standard Error: 6
-			.saturating_add(Weight::from_ref_time(507).saturating_mul(l.into()))
+		//  Estimated: `4197507 + l * (2 ±0)`
+		// Minimum execution time: 2_370 nanoseconds.
+		Weight::from_ref_time(2_474_000)
+			.saturating_add(Weight::from_proof_size(4197507))
+			// Standard Error: 11
+			.saturating_add(Weight::from_ref_time(956).saturating_mul(l.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_proof_size(2).saturating_mul(l.into()))
 	}
@@ -736,11 +790,12 @@ impl WeightInfo for () {
 	fn measured_mixed_storage_double_value_read_linear_size(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `235 + l * (2 ±0)`
-		//  Estimated: `4195527 + l * (2 ±0)`
-		// Minimum execution time: 4_236 nanoseconds.
-		Weight::from_parts(4_236_000, 4195527)
-			// Standard Error: 8
-			.saturating_add(Weight::from_ref_time(517).saturating_mul(l.into()))
+		//  Estimated: `4197507 + l * (2 ±0)`
+		// Minimum execution time: 2_375 nanoseconds.
+		Weight::from_ref_time(2_420_000)
+			.saturating_add(Weight::from_proof_size(4197507))
+			// Standard Error: 9
+			.saturating_add(Weight::from_ref_time(914).saturating_mul(l.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_proof_size(2).saturating_mul(l.into()))
 	}
@@ -752,11 +807,12 @@ impl WeightInfo for () {
 	fn storage_map_unbounded_both_measured_read(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `293 + i * (8 ±0)`
-		//  Estimated: `5524 + i * (16 ±0)`
-		// Minimum execution time: 5_649 nanoseconds.
-		Weight::from_parts(6_111_237, 5524)
-			// Standard Error: 1_060
-			.saturating_add(Weight::from_ref_time(2_693).saturating_mul(i.into()))
+		//  Estimated: `7504 + i * (16 ±0)`
+		// Minimum execution time: 3_305 nanoseconds.
+		Weight::from_ref_time(3_689_335)
+			.saturating_add(Weight::from_proof_size(7504))
+			// Standard Error: 29
+			.saturating_add(Weight::from_ref_time(638).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_proof_size(16).saturating_mul(i.into()))
 	}
@@ -768,9 +824,12 @@ impl WeightInfo for () {
 	fn storage_map_partial_unbounded_read(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `260 + i * (4 ±0)`
-		//  Estimated: `5243 + i * (4 ±0)`
-		// Minimum execution time: 5_997 nanoseconds.
-		Weight::from_parts(7_996_508, 5243)
+		//  Estimated: `7223 + i * (4 ±0)`
+		// Minimum execution time: 3_469 nanoseconds.
+		Weight::from_ref_time(3_878_896)
+			.saturating_add(Weight::from_proof_size(7223))
+			// Standard Error: 33
+			.saturating_add(Weight::from_ref_time(356).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_proof_size(4).saturating_mul(i.into()))
 	}
@@ -782,11 +841,12 @@ impl WeightInfo for () {
 	fn storage_map_partial_unbounded_ignored_read(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `260 + i * (4 ±0)`
-		//  Estimated: `2768 + i * (4 ±0)`
-		// Minimum execution time: 5_679 nanoseconds.
-		Weight::from_parts(6_496_804, 2768)
-			// Standard Error: 611
-			.saturating_add(Weight::from_ref_time(930).saturating_mul(i.into()))
+		//  Estimated: `3758 + i * (4 ±0)`
+		// Minimum execution time: 3_442 nanoseconds.
+		Weight::from_ref_time(3_881_051)
+			.saturating_add(Weight::from_proof_size(3758))
+			// Standard Error: 35
+			.saturating_add(Weight::from_ref_time(384).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_proof_size(4).saturating_mul(i.into()))
 	}
@@ -794,14 +854,16 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_087 nanoseconds.
-		Weight::from_ref_time(7_087_000)
+		// Minimum execution time: 1_619 nanoseconds.
+		Weight::from_ref_time(1_728_000)
+			.saturating_add(Weight::from_proof_size(0))
 	}
 	fn noop() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_719 nanoseconds.
-		Weight::from_ref_time(2_719_000)
+		// Minimum execution time: 546 nanoseconds.
+		Weight::from_ref_time(640_000)
+			.saturating_add(Weight::from_proof_size(0))
 	}
 }
diff --git a/frame/glutton/src/tests.rs b/frame/glutton/src/tests.rs
index d2d2d4edec421..8d2c86ed45471 100644
--- a/frame/glutton/src/tests.rs
+++ b/frame/glutton/src/tests.rs
@@ -177,7 +177,7 @@ fn on_idle_weight_low_proof_is_close_enough_works() {
 		let ratio = Perbill::from_rational(got.proof_size(), should.proof_size());
 		// Just a sanity check here.
 		assert!(
-			ratio >= Perbill::from_percent(80),
+			ratio >= Perbill::from_percent(50),
 			"Too few proof size consumed, was only {:?} of expected",
 			ratio
 		);
diff --git a/frame/glutton/src/weights.rs b/frame/glutton/src/weights.rs
index 1e09d02c69d1c..9c8e161c825f2 100644
--- a/frame/glutton/src/weights.rs
+++ b/frame/glutton/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +18,9 @@
 //! Autogenerated weights for pallet_glutton
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ehxwxxsd-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -33,7 +33,7 @@
 // --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/substrate/.git/.artifacts/bench.json
+// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/substrate/.git/.artifacts/bench.json
 // --pallet=pallet_glutton
 // --chain=dev
 // --header=./HEADER-APACHE2
@@ -71,12 +71,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn initialize_pallet_grow(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
-		//  Estimated: `499`
-		// Minimum execution time: 9_248 nanoseconds.
-		Weight::from_ref_time(9_582_000)
-			.saturating_add(Weight::from_proof_size(499))
-			// Standard Error: 1_144
-			.saturating_add(Weight::from_ref_time(1_624_225).saturating_mul(n.into()))
+		//  Estimated: `1489`
+		// Minimum execution time: 10_218 nanoseconds.
+		Weight::from_ref_time(10_510_000)
+			.saturating_add(Weight::from_proof_size(1489))
+			// Standard Error: 1_582
+			.saturating_add(Weight::from_ref_time(1_577_660).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
@@ -89,12 +89,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn initialize_pallet_shrink(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `65`
-		//  Estimated: `499`
-		// Minimum execution time: 10_210 nanoseconds.
-		Weight::from_ref_time(7_260_854)
-			.saturating_add(Weight::from_proof_size(499))
-			// Standard Error: 1_459
-			.saturating_add(Weight::from_ref_time(1_053_844).saturating_mul(n.into()))
+		//  Estimated: `1489`
+		// Minimum execution time: 10_993 nanoseconds.
+		Weight::from_ref_time(11_208_000)
+			.saturating_add(Weight::from_proof_size(1489))
+			// Standard Error: 1_386
+			.saturating_add(Weight::from_ref_time(1_072_330).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
@@ -104,11 +104,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 605 nanoseconds.
-		Weight::from_ref_time(1_102_112)
+		// Minimum execution time: 740 nanoseconds.
+		Weight::from_ref_time(770_000)
 			.saturating_add(Weight::from_proof_size(0))
-			// Standard Error: 28
-			.saturating_add(Weight::from_ref_time(120_597).saturating_mul(i.into()))
+			// Standard Error: 24
+			.saturating_add(Weight::from_ref_time(96_434).saturating_mul(i.into()))
 	}
 	/// Storage: Glutton TrashData (r:5000 w:0)
 	/// Proof: Glutton TrashData (max_values: Some(65000), max_size: Some(1036), added: 3016, mode: MaxEncodedLen)
@@ -116,12 +116,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn waste_proof_size_some(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `119036 + i * (1053 ±0)`
-		//  Estimated: `0 + i * (3016 ±0)`
-		// Minimum execution time: 464 nanoseconds.
-		Weight::from_ref_time(552_000)
-			.saturating_add(Weight::from_proof_size(0))
-			// Standard Error: 1_962
-			.saturating_add(Weight::from_ref_time(5_780_304).saturating_mul(i.into()))
+		//  Estimated: `990 + i * (3016 ±0)`
+		// Minimum execution time: 630 nanoseconds.
+		Weight::from_ref_time(712_000)
+			.saturating_add(Weight::from_proof_size(990))
+			// Standard Error: 4_326
+			.saturating_add(Weight::from_ref_time(5_500_880).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(i.into())))
 			.saturating_add(Weight::from_proof_size(3016).saturating_mul(i.into()))
 	}
@@ -129,31 +129,31 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: Glutton Storage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
 	/// Storage: Glutton Compute (r:1 w:0)
 	/// Proof: Glutton Compute (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Glutton TrashData (r:1738 w:0)
+	/// Storage: Glutton TrashData (r:1737 w:0)
 	/// Proof: Glutton TrashData (max_values: Some(65000), max_size: Some(1036), added: 3016, mode: MaxEncodedLen)
 	fn on_idle_high_proof_waste() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1955391`
-		//  Estimated: `5242806`
-		// Minimum execution time: 55_398_405 nanoseconds.
-		Weight::from_ref_time(55_594_848_000)
-			.saturating_add(Weight::from_proof_size(5242806))
-			.saturating_add(T::DbWeight::get().reads(1740_u64))
+		//  Measured:  `1954313`
+		//  Estimated: `5242760`
+		// Minimum execution time: 56_743_236 nanoseconds.
+		Weight::from_ref_time(57_088_040_000)
+			.saturating_add(Weight::from_proof_size(5242760))
+			.saturating_add(T::DbWeight::get().reads(1739_u64))
 	}
 	/// Storage: Glutton Storage (r:1 w:0)
 	/// Proof: Glutton Storage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
 	/// Storage: Glutton Compute (r:1 w:0)
 	/// Proof: Glutton Compute (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Glutton TrashData (r:6 w:0)
+	/// Storage: Glutton TrashData (r:5 w:0)
 	/// Proof: Glutton TrashData (max_values: Some(65000), max_size: Some(1036), added: 3016, mode: MaxEncodedLen)
 	fn on_idle_low_proof_waste() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `11717`
-		//  Estimated: `19094`
-		// Minimum execution time: 98_888_667 nanoseconds.
-		Weight::from_ref_time(99_157_239_000)
-			.saturating_add(Weight::from_proof_size(19094))
-			.saturating_add(T::DbWeight::get().reads(8_u64))
+		//  Measured:  `9671`
+		//  Estimated: `19048`
+		// Minimum execution time: 100_387_042 nanoseconds.
+		Weight::from_ref_time(100_987_577_000)
+			.saturating_add(Weight::from_proof_size(19048))
+			.saturating_add(T::DbWeight::get().reads(7_u64))
 	}
 	/// Storage: Glutton Storage (r:1 w:0)
 	/// Proof: Glutton Storage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
@@ -162,10 +162,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn empty_on_idle() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
-		//  Estimated: `998`
-		// Minimum execution time: 3_967 nanoseconds.
-		Weight::from_ref_time(4_121_000)
-			.saturating_add(Weight::from_proof_size(998))
+		//  Estimated: `2978`
+		// Minimum execution time: 4_256 nanoseconds.
+		Weight::from_ref_time(4_447_000)
+			.saturating_add(Weight::from_proof_size(2978))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// Storage: Glutton Compute (r:0 w:1)
@@ -174,8 +174,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_112 nanoseconds.
-		Weight::from_ref_time(7_484_000)
+		// Minimum execution time: 8_663 nanoseconds.
+		Weight::from_ref_time(8_864_000)
 			.saturating_add(Weight::from_proof_size(0))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -185,8 +185,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_056 nanoseconds.
-		Weight::from_ref_time(7_414_000)
+		// Minimum execution time: 8_653 nanoseconds.
+		Weight::from_ref_time(8_998_000)
 			.saturating_add(Weight::from_proof_size(0))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -202,12 +202,12 @@ impl WeightInfo for () {
 	fn initialize_pallet_grow(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
-		//  Estimated: `499`
-		// Minimum execution time: 9_248 nanoseconds.
-		Weight::from_ref_time(9_582_000)
-			.saturating_add(Weight::from_proof_size(499))
-			// Standard Error: 1_144
-			.saturating_add(Weight::from_ref_time(1_624_225).saturating_mul(n.into()))
+		//  Estimated: `1489`
+		// Minimum execution time: 10_218 nanoseconds.
+		Weight::from_ref_time(10_510_000)
+			.saturating_add(Weight::from_proof_size(1489))
+			// Standard Error: 1_582
+			.saturating_add(Weight::from_ref_time(1_577_660).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into())))
@@ -220,12 +220,12 @@ impl WeightInfo for () {
 	fn initialize_pallet_shrink(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `65`
-		//  Estimated: `499`
-		// Minimum execution time: 10_210 nanoseconds.
-		Weight::from_ref_time(7_260_854)
-			.saturating_add(Weight::from_proof_size(499))
-			// Standard Error: 1_459
-			.saturating_add(Weight::from_ref_time(1_053_844).saturating_mul(n.into()))
+		//  Estimated: `1489`
+		// Minimum execution time: 10_993 nanoseconds.
+		Weight::from_ref_time(11_208_000)
+			.saturating_add(Weight::from_proof_size(1489))
+			// Standard Error: 1_386
+			.saturating_add(Weight::from_ref_time(1_072_330).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into())))
@@ -235,11 +235,11 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 605 nanoseconds.
-		Weight::from_ref_time(1_102_112)
+		// Minimum execution time: 740 nanoseconds.
+		Weight::from_ref_time(770_000)
 			.saturating_add(Weight::from_proof_size(0))
-			// Standard Error: 28
-			.saturating_add(Weight::from_ref_time(120_597).saturating_mul(i.into()))
+			// Standard Error: 24
+			.saturating_add(Weight::from_ref_time(96_434).saturating_mul(i.into()))
 	}
 	/// Storage: Glutton TrashData (r:5000 w:0)
 	/// Proof: Glutton TrashData (max_values: Some(65000), max_size: Some(1036), added: 3016, mode: MaxEncodedLen)
@@ -247,12 +247,12 @@ impl WeightInfo for () {
 	fn waste_proof_size_some(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `119036 + i * (1053 ±0)`
-		//  Estimated: `0 + i * (3016 ±0)`
-		// Minimum execution time: 464 nanoseconds.
-		Weight::from_ref_time(552_000)
-			.saturating_add(Weight::from_proof_size(0))
-			// Standard Error: 1_962
-			.saturating_add(Weight::from_ref_time(5_780_304).saturating_mul(i.into()))
+		//  Estimated: `990 + i * (3016 ±0)`
+		// Minimum execution time: 630 nanoseconds.
+		Weight::from_ref_time(712_000)
+			.saturating_add(Weight::from_proof_size(990))
+			// Standard Error: 4_326
+			.saturating_add(Weight::from_ref_time(5_500_880).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(i.into())))
 			.saturating_add(Weight::from_proof_size(3016).saturating_mul(i.into()))
 	}
@@ -260,31 +260,31 @@ impl WeightInfo for () {
 	/// Proof: Glutton Storage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
 	/// Storage: Glutton Compute (r:1 w:0)
 	/// Proof: Glutton Compute (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Glutton TrashData (r:1738 w:0)
+	/// Storage: Glutton TrashData (r:1737 w:0)
 	/// Proof: Glutton TrashData (max_values: Some(65000), max_size: Some(1036), added: 3016, mode: MaxEncodedLen)
 	fn on_idle_high_proof_waste() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1955391`
-		//  Estimated: `5242806`
-		// Minimum execution time: 55_398_405 nanoseconds.
-		Weight::from_ref_time(55_594_848_000)
-			.saturating_add(Weight::from_proof_size(5242806))
-			.saturating_add(RocksDbWeight::get().reads(1740_u64))
+		//  Measured:  `1954313`
+		//  Estimated: `5242760`
+		// Minimum execution time: 56_743_236 nanoseconds.
+		Weight::from_ref_time(57_088_040_000)
+			.saturating_add(Weight::from_proof_size(5242760))
+			.saturating_add(RocksDbWeight::get().reads(1739_u64))
 	}
 	/// Storage: Glutton Storage (r:1 w:0)
 	/// Proof: Glutton Storage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
 	/// Storage: Glutton Compute (r:1 w:0)
 	/// Proof: Glutton Compute (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Glutton TrashData (r:6 w:0)
+	/// Storage: Glutton TrashData (r:5 w:0)
 	/// Proof: Glutton TrashData (max_values: Some(65000), max_size: Some(1036), added: 3016, mode: MaxEncodedLen)
 	fn on_idle_low_proof_waste() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `11717`
-		//  Estimated: `19094`
-		// Minimum execution time: 98_888_667 nanoseconds.
-		Weight::from_ref_time(99_157_239_000)
-			.saturating_add(Weight::from_proof_size(19094))
-			.saturating_add(RocksDbWeight::get().reads(8_u64))
+		//  Measured:  `9671`
+		//  Estimated: `19048`
+		// Minimum execution time: 100_387_042 nanoseconds.
+		Weight::from_ref_time(100_987_577_000)
+			.saturating_add(Weight::from_proof_size(19048))
+			.saturating_add(RocksDbWeight::get().reads(7_u64))
 	}
 	/// Storage: Glutton Storage (r:1 w:0)
 	/// Proof: Glutton Storage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
@@ -293,10 +293,10 @@ impl WeightInfo for () {
 	fn empty_on_idle() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
-		//  Estimated: `998`
-		// Minimum execution time: 3_967 nanoseconds.
-		Weight::from_ref_time(4_121_000)
-			.saturating_add(Weight::from_proof_size(998))
+		//  Estimated: `2978`
+		// Minimum execution time: 4_256 nanoseconds.
+		Weight::from_ref_time(4_447_000)
+			.saturating_add(Weight::from_proof_size(2978))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// Storage: Glutton Compute (r:0 w:1)
@@ -305,8 +305,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_112 nanoseconds.
-		Weight::from_ref_time(7_484_000)
+		// Minimum execution time: 8_663 nanoseconds.
+		Weight::from_ref_time(8_864_000)
 			.saturating_add(Weight::from_proof_size(0))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -316,8 +316,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_056 nanoseconds.
-		Weight::from_ref_time(7_414_000)
+		// Minimum execution time: 8_653 nanoseconds.
+		Weight::from_ref_time(8_998_000)
 			.saturating_add(Weight::from_proof_size(0))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/frame/message-queue/src/weights.rs b/frame/message-queue/src/weights.rs
index b48cf811a17ef..3421c2f2f59af 100644
--- a/frame/message-queue/src/weights.rs
+++ b/frame/message-queue/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_message_queue
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-24, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-02-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
@@ -70,11 +70,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
 	fn ready_ring_knit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `829`
-		//  Estimated: `5547`
-		// Minimum execution time: 15_241 nanoseconds.
-		Weight::from_ref_time(15_603_000)
-			.saturating_add(Weight::from_proof_size(5547))
+		//  Measured:  `295`
+		//  Estimated: `7527`
+		// Minimum execution time: 12_538 nanoseconds.
+		Weight::from_ref_time(12_799_000)
+			.saturating_add(Weight::from_proof_size(7527))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -84,11 +84,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
 	fn ready_ring_unknit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `829`
-		//  Estimated: `5547`
-		// Minimum execution time: 14_652 nanoseconds.
-		Weight::from_ref_time(14_983_000)
-			.saturating_add(Weight::from_proof_size(5547))
+		//  Measured:  `295`
+		//  Estimated: `7527`
+		// Minimum execution time: 11_727 nanoseconds.
+		Weight::from_ref_time(12_177_000)
+			.saturating_add(Weight::from_proof_size(7527))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -96,11 +96,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
 	fn service_queue_base() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `576`
-		//  Estimated: `2524`
-		// Minimum execution time: 5_750 nanoseconds.
-		Weight::from_ref_time(6_003_000)
-			.saturating_add(Weight::from_proof_size(2524))
+		//  Measured:  `42`
+		//  Estimated: `3514`
+		// Minimum execution time: 4_983 nanoseconds.
+		Weight::from_ref_time(5_174_000)
+			.saturating_add(Weight::from_proof_size(3514))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -108,11 +108,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65584), added: 68059, mode: MaxEncodedLen)
 	fn service_page_base_completion() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `647`
-		//  Estimated: `68059`
-		// Minimum execution time: 8_257 nanoseconds.
-		Weight::from_ref_time(8_506_000)
-			.saturating_add(Weight::from_proof_size(68059))
+		//  Measured:  `113`
+		//  Estimated: `69049`
+		// Minimum execution time: 6_299 nanoseconds.
+		Weight::from_ref_time(6_670_000)
+			.saturating_add(Weight::from_proof_size(69049))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -120,20 +120,20 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65584), added: 68059, mode: MaxEncodedLen)
 	fn service_page_base_no_completion() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `647`
-		//  Estimated: `68059`
-		// Minimum execution time: 8_422 nanoseconds.
-		Weight::from_ref_time(8_589_000)
-			.saturating_add(Weight::from_proof_size(68059))
+		//  Measured:  `113`
+		//  Estimated: `69049`
+		// Minimum execution time: 6_762 nanoseconds.
+		Weight::from_ref_time(7_059_000)
+			.saturating_add(Weight::from_proof_size(69049))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	fn service_page_item() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `972`
+		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 81_929 nanoseconds.
-		Weight::from_ref_time(82_375_000)
+		// Minimum execution time: 72_681 nanoseconds.
+		Weight::from_ref_time(73_147_000)
 			.saturating_add(Weight::from_proof_size(0))
 	}
 	/// Storage: MessageQueue ServiceHead (r:1 w:1)
@@ -142,11 +142,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
 	fn bump_service_head() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `706`
-		//  Estimated: `3023`
-		// Minimum execution time: 8_992 nanoseconds.
-		Weight::from_ref_time(9_200_000)
-			.saturating_add(Weight::from_proof_size(3023))
+		//  Measured:  `172`
+		//  Estimated: `5003`
+		// Minimum execution time: 7_066 nanoseconds.
+		Weight::from_ref_time(7_214_000)
+			.saturating_add(Weight::from_proof_size(5003))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -156,11 +156,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65584), added: 68059, mode: MaxEncodedLen)
 	fn reap_page() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66825`
-		//  Estimated: `70583`
-		// Minimum execution time: 68_292 nanoseconds.
-		Weight::from_ref_time(69_108_000)
-			.saturating_add(Weight::from_proof_size(70583))
+		//  Measured:  `65742`
+		//  Estimated: `72563`
+		// Minimum execution time: 57_778 nanoseconds.
+		Weight::from_ref_time(58_778_000)
+			.saturating_add(Weight::from_proof_size(72563))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -170,11 +170,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65584), added: 68059, mode: MaxEncodedLen)
 	fn execute_overweight_page_removed() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66825`
-		//  Estimated: `70583`
-		// Minimum execution time: 83_855 nanoseconds.
-		Weight::from_ref_time(84_946_000)
-			.saturating_add(Weight::from_proof_size(70583))
+		//  Measured:  `65742`
+		//  Estimated: `72563`
+		// Minimum execution time: 72_144 nanoseconds.
+		Weight::from_ref_time(72_942_000)
+			.saturating_add(Weight::from_proof_size(72563))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -184,11 +184,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65584), added: 68059, mode: MaxEncodedLen)
 	fn execute_overweight_page_updated() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66825`
-		//  Estimated: `70583`
-		// Minimum execution time: 96_997 nanoseconds.
-		Weight::from_ref_time(98_668_000)
-			.saturating_add(Weight::from_proof_size(70583))
+		//  Measured:  `65742`
+		//  Estimated: `72563`
+		// Minimum execution time: 84_890 nanoseconds.
+		Weight::from_ref_time(86_073_000)
+			.saturating_add(Weight::from_proof_size(72563))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -202,11 +202,11 @@ impl WeightInfo for () {
 	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
 	fn ready_ring_knit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `829`
-		//  Estimated: `5547`
-		// Minimum execution time: 15_241 nanoseconds.
-		Weight::from_ref_time(15_603_000)
-			.saturating_add(Weight::from_proof_size(5547))
+		//  Measured:  `295`
+		//  Estimated: `7527`
+		// Minimum execution time: 12_538 nanoseconds.
+		Weight::from_ref_time(12_799_000)
+			.saturating_add(Weight::from_proof_size(7527))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -216,11 +216,11 @@ impl WeightInfo for () {
 	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
 	fn ready_ring_unknit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `829`
-		//  Estimated: `5547`
-		// Minimum execution time: 14_652 nanoseconds.
-		Weight::from_ref_time(14_983_000)
-			.saturating_add(Weight::from_proof_size(5547))
+		//  Measured:  `295`
+		//  Estimated: `7527`
+		// Minimum execution time: 11_727 nanoseconds.
+		Weight::from_ref_time(12_177_000)
+			.saturating_add(Weight::from_proof_size(7527))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -228,11 +228,11 @@ impl WeightInfo for () {
 	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
 	fn service_queue_base() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `576`
-		//  Estimated: `2524`
-		// Minimum execution time: 5_750 nanoseconds.
-		Weight::from_ref_time(6_003_000)
-			.saturating_add(Weight::from_proof_size(2524))
+		//  Measured:  `42`
+		//  Estimated: `3514`
+		// Minimum execution time: 4_983 nanoseconds.
+		Weight::from_ref_time(5_174_000)
+			.saturating_add(Weight::from_proof_size(3514))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -240,11 +240,11 @@ impl WeightInfo for () {
 	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65584), added: 68059, mode: MaxEncodedLen)
 	fn service_page_base_completion() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `647`
-		//  Estimated: `68059`
-		// Minimum execution time: 8_257 nanoseconds.
-		Weight::from_ref_time(8_506_000)
-			.saturating_add(Weight::from_proof_size(68059))
+		//  Measured:  `113`
+		//  Estimated: `69049`
+		// Minimum execution time: 6_299 nanoseconds.
+		Weight::from_ref_time(6_670_000)
+			.saturating_add(Weight::from_proof_size(69049))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -252,20 +252,20 @@ impl WeightInfo for () {
 	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65584), added: 68059, mode: MaxEncodedLen)
 	fn service_page_base_no_completion() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `647`
-		//  Estimated: `68059`
-		// Minimum execution time: 8_422 nanoseconds.
-		Weight::from_ref_time(8_589_000)
-			.saturating_add(Weight::from_proof_size(68059))
+		//  Measured:  `113`
+		//  Estimated: `69049`
+		// Minimum execution time: 6_762 nanoseconds.
+		Weight::from_ref_time(7_059_000)
+			.saturating_add(Weight::from_proof_size(69049))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	fn service_page_item() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `972`
+		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 81_929 nanoseconds.
-		Weight::from_ref_time(82_375_000)
+		// Minimum execution time: 72_681 nanoseconds.
+		Weight::from_ref_time(73_147_000)
 			.saturating_add(Weight::from_proof_size(0))
 	}
 	/// Storage: MessageQueue ServiceHead (r:1 w:1)
@@ -274,11 +274,11 @@ impl WeightInfo for () {
 	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
 	fn bump_service_head() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `706`
-		//  Estimated: `3023`
-		// Minimum execution time: 8_992 nanoseconds.
-		Weight::from_ref_time(9_200_000)
-			.saturating_add(Weight::from_proof_size(3023))
+		//  Measured:  `172`
+		//  Estimated: `5003`
+		// Minimum execution time: 7_066 nanoseconds.
+		Weight::from_ref_time(7_214_000)
+			.saturating_add(Weight::from_proof_size(5003))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -288,11 +288,11 @@ impl WeightInfo for () {
 	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65584), added: 68059, mode: MaxEncodedLen)
 	fn reap_page() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66825`
-		//  Estimated: `70583`
-		// Minimum execution time: 68_292 nanoseconds.
-		Weight::from_ref_time(69_108_000)
-			.saturating_add(Weight::from_proof_size(70583))
+		//  Measured:  `65742`
+		//  Estimated: `72563`
+		// Minimum execution time: 57_778 nanoseconds.
+		Weight::from_ref_time(58_778_000)
+			.saturating_add(Weight::from_proof_size(72563))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -302,11 +302,11 @@ impl WeightInfo for () {
 	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65584), added: 68059, mode: MaxEncodedLen)
 	fn execute_overweight_page_removed() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66825`
-		//  Estimated: `70583`
-		// Minimum execution time: 83_855 nanoseconds.
-		Weight::from_ref_time(84_946_000)
-			.saturating_add(Weight::from_proof_size(70583))
+		//  Measured:  `65742`
+		//  Estimated: `72563`
+		// Minimum execution time: 72_144 nanoseconds.
+		Weight::from_ref_time(72_942_000)
+			.saturating_add(Weight::from_proof_size(72563))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -316,11 +316,11 @@ impl WeightInfo for () {
 	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65584), added: 68059, mode: MaxEncodedLen)
 	fn execute_overweight_page_updated() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66825`
-		//  Estimated: `70583`
-		// Minimum execution time: 96_997 nanoseconds.
-		Weight::from_ref_time(98_668_000)
-			.saturating_add(Weight::from_proof_size(70583))
+		//  Measured:  `65742`
+		//  Estimated: `72563`
+		// Minimum execution time: 84_890 nanoseconds.
+		Weight::from_ref_time(86_073_000)
+			.saturating_add(Weight::from_proof_size(72563))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
diff --git a/frame/support/procedural/src/benchmark.rs b/frame/support/procedural/src/benchmark.rs
index 1aca2f87b1d1d..4f9994b6cd073 100644
--- a/frame/support/procedural/src/benchmark.rs
+++ b/frame/support/procedural/src/benchmark.rs
@@ -567,7 +567,12 @@ pub fn benchmarks(
 						#support::storage::transactional::TRANSACTION_LEVEL_KEY.into(),
 					);
 					whitelist.push(transactional_layer_key);
-					#krate::benchmarking::set_whitelist(whitelist);
+					// Whitelist the `:extrinsic_index`.
+					let extrinsic_index = #krate::TrackedStorageKey::new(
+						#krate::well_known_keys::EXTRINSIC_INDEX.into()
+					);
+					whitelist.push(extrinsic_index);
+					#krate::benchmarking::set_whitelist(whitelist.clone());
 					let mut results: #krate::Vec<#krate::BenchmarkResult> = #krate::Vec::new();
 
 					// Always do at least one internal repeat...
@@ -590,6 +595,12 @@ pub fn benchmarks(
 						// This will enable worst case scenario for reading from the database.
 						#krate::benchmarking::commit_db();
 
+						// Access all whitelisted keys to get them into the proof recorder since the
+						// recorder does now have a whitelist.
+						for key in &whitelist {
+							#krate::frame_support::storage::unhashed::get_raw(&key.key);
+						}
+
 						// Reset the read/write counter so we don't count operations in the setup process.
 						#krate::benchmarking::reset_read_write_count();
 
diff --git a/utils/frame/benchmarking-cli/src/pallet/mod.rs b/utils/frame/benchmarking-cli/src/pallet/mod.rs
index 9ae9846745918..f214569051d45 100644
--- a/utils/frame/benchmarking-cli/src/pallet/mod.rs
+++ b/utils/frame/benchmarking-cli/src/pallet/mod.rs
@@ -187,7 +187,7 @@ pub struct PalletCmd {
 	/// Each layer will result in an additional 495 bytes PoV per distinct top-level access.
 	/// Therefore multiple `StorageMap` accesses only suffer from this increase once. The exact
 	/// number of storage items depends on the runtime and the deployed pallets.
-	#[clap(long, default_value = "0")]
+	#[clap(long, default_value = "2")]
 	pub additional_trie_layers: u8,
 
 	/// A path to a `.json` file with existing benchmark results generated with `--json` or