diff --git a/misc/frame_weight_template.hbs b/misc/frame_weight_template.hbs
index 373da00e6..d2524d4e8 100644
--- a/misc/frame_weight_template.hbs
+++ b/misc/frame_weight_template.hbs
@@ -25,6 +25,9 @@ impl<T: frame_system::Config> {{pallet}}::weights::WeightInfo for WeightInfo<T>
     {{#each benchmark.comments as |comment|}}
     /// {{comment}}
     {{/each}}
+    {{#each benchmark.component_ranges as |range|}}
+    /// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`.
+    {{/each}}
     fn {{benchmark.name~}}
     (
         {{~#each benchmark.components as |c| ~}}
@@ -34,27 +37,26 @@ impl<T: frame_system::Config> {{pallet}}::weights::WeightInfo for WeightInfo<T>
         //  Measured:  `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
         //  Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
         // Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
-        {{#if (ne benchmark.base_calculated_proof_size "0")}}
         Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
-        {{else}}
-        Weight::from_ref_time({{underscore benchmark.base_weight}})
-        {{/if}}
             {{#each benchmark.component_weight as |cw|}}
             // Standard Error: {{underscore cw.error}}
-            .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
+            .saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
             {{/each}}
             {{#if (ne benchmark.base_reads "0")}}
-            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64))
+            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
             {{/if}}
             {{#each benchmark.component_reads as |cr|}}
             .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
             {{/each}}
             {{#if (ne benchmark.base_writes "0")}}
-            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}_u64))
+            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
             {{/if}}
+            {{#each benchmark.component_writes as |cw|}}
+            .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
+            {{/each}}
             {{#each benchmark.component_calculated_proof_size as |cp|}}
-			.saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into()))
-			{{/each}}
+           .saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into()))
+           {{/each}}
     }
     {{/each}}
 }
diff --git a/misc/orml_weight_template.hbs b/misc/orml_weight_template.hbs
index eec55f462..2da62c06e 100644
--- a/misc/orml_weight_template.hbs
+++ b/misc/orml_weight_template.hbs
@@ -25,6 +25,9 @@ impl<T: frame_system::Config> {{pallet}}::WeightInfo for WeightInfo<T> {
     {{#each benchmark.comments as |comment|}}
     /// {{comment}}
     {{/each}}
+    {{#each benchmark.component_ranges as |range|}}
+    /// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`.
+    {{/each}}
     fn {{benchmark.name~}}
     (
         {{~#each benchmark.components as |c| ~}}
@@ -34,27 +37,26 @@ impl<T: frame_system::Config> {{pallet}}::WeightInfo for WeightInfo<T> {
         //  Measured:  `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
         //  Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
         // Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
-        {{#if (ne benchmark.base_calculated_proof_size "0")}}
         Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
-        {{else}}
-        Weight::from_ref_time({{underscore benchmark.base_weight}})
-        {{/if}}
             {{#each benchmark.component_weight as |cw|}}
             // Standard Error: {{underscore cw.error}}
-            .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
+            .saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
             {{/each}}
             {{#if (ne benchmark.base_reads "0")}}
-            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64))
+            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
             {{/if}}
             {{#each benchmark.component_reads as |cr|}}
             .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
             {{/each}}
             {{#if (ne benchmark.base_writes "0")}}
-            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}_u64))
+            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
             {{/if}}
+            {{#each benchmark.component_writes as |cw|}}
+            .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
+            {{/each}}
             {{#each benchmark.component_calculated_proof_size as |cp|}}
-			.saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into()))
-			{{/each}}
+           .saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into()))
+           {{/each}}
     }
     {{/each}}
 }
diff --git a/misc/weight_template.hbs b/misc/weight_template.hbs
index 30c93b830..875819dda 100644
--- a/misc/weight_template.hbs
+++ b/misc/weight_template.hbs
@@ -37,6 +37,9 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     {{#each benchmark.comments as |comment|}}
     /// {{comment}}
     {{/each}}
+    {{#each benchmark.component_ranges as |range|}}
+    /// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`.
+    {{/each}}
     fn {{benchmark.name~}}
     (
         {{~#each benchmark.components as |c| ~}}
@@ -46,27 +49,26 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
         //  Measured:  `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
         //  Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
         // Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
-        {{#if (ne benchmark.base_calculated_proof_size "0")}}
         Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
-        {{else}}
-        Weight::from_ref_time({{underscore benchmark.base_weight}})
-        {{/if}}
             {{#each benchmark.component_weight as |cw|}}
             // Standard Error: {{underscore cw.error}}
-            .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
+            .saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
             {{/each}}
             {{#if (ne benchmark.base_reads "0")}}
-            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64))
+            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
             {{/if}}
             {{#each benchmark.component_reads as |cr|}}
             .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
             {{/each}}
             {{#if (ne benchmark.base_writes "0")}}
-            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}_u64))
+            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
             {{/if}}
+            {{#each benchmark.component_writes as |cw|}}
+            .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
+            {{/each}}
             {{#each benchmark.component_calculated_proof_size as |cp|}}
-			.saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into()))
-			{{/each}}
+           .saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into()))
+           {{/each}}
     }
     {{/each}}
 }