diff --git a/l10n_us_hr_payroll/data/state/ga_georgia.xml b/l10n_us_hr_payroll/data/state/ga_georgia.xml
index 3c900ce6..437a4703 100644
--- a/l10n_us_hr_payroll/data/state/ga_georgia.xml
+++ b/l10n_us_hr_payroll/data/state/ga_georgia.xml
@@ -6,14 +6,11 @@
         <field name="code">us_ga_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Not changed in 2021 https://dol.georgia.gov/faqs-employers/employers-faqs-unemployment-insurance -->
-        <record id="rule_parameter_us_ga_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">9500.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ga_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ga_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">9500.00</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ga_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_ga_suta_rate" model="hr.rule.parameter">
@@ -22,7 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- Not changed in 2021 https://dol.georgia.gov/faqs-employers/employers-faqs-unemployment-insurance -->
         <record id="rule_parameter_us_ga_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">2.7</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_ga_suta_rate"/>
@@ -35,455 +31,435 @@
         <field name="code">us_ga_sit_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- https://dor.georgia.gov/employers-tax-guide File 2020 -->
-        <!-- Table F, G ,H-->
-        <!-- Not changed in 2021 https://dor.georgia.gov/employers-tax-guide File 2021 -->
-        <record id="rule_parameter_us_ga_sit_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'married filing joint, both spouses working': {
-                    'weekly': (
-                        ( 9.50, 0.00, 1.00),
-                        (29.00, 0.10, 2.00),
-                        (48.00, 0.48, 3.00),
-                        (67.50, 1.06, 4.00),
-                        (96.00, 1.83, 5.00),
-                        ('inf', 3.27, 5.75),
-                    ),
-                    'bi-weekly': (
-                        ( 19.00, 0.00, 1.00),
-                        ( 57.50, 0.19, 2.00),
-                        ( 96.00, 0.96, 3.00),
-                        (135.00, 2.12, 4.00),
-                        (192.00, 3.65, 5.00),
-                        ( 'inf', 6.54, 5.75),
-                    ),
-                    'semi-monthly': (
-                        ( 21.00, 0.00, 1.00),
-                        ( 62.50, 0.21, 2.00),
-                        (104.00, 1.04, 3.00),
-                        (146.00, 2.29, 4.00),
-                        (208.00, 3.96, 5.00),
-                        ( 'inf', 7.08, 5.75),
-                    ),
-                    'monthly': (
-                        ( 41.50,  0.00, 1.00),
-                        (125.50,  0.42, 2.00),
-                        (208.00,  2.08, 3.00),
-                        (292.00,  4.58, 4.00),
-                        (417.00,  7.92, 5.00),
-                        ( 'inf', 14.17, 5.75),
-                    ),
-                    'quarterly': (
-                        ( 125.00,  0.00, 1.00),
-                        ( 375.00,  1.25, 2.00),
-                        ( 625.00,  6.25, 3.00),
-                        ( 875.00, 13.75, 4.00),
-                        (1250.00, 23.75, 5.00),
-                        (  'inf', 42.50, 5.75),
-                    ),
-                    'semi-annual': (
-                        ( 250.00,  0.00, 1.00),
-                        ( 750.00,  2.50, 2.00),
-                        (1250.00, 12.50, 3.00),
-                        (1750.00, 27.50, 4.00),
-                        (2500.00, 47.50, 5.00),
-                        (  'inf', 85.00, 5.75),
-                    ),
-                    'annual': (
-                        ( 500.00,   0.00, 1.00),
-                        (1500.00,   5.00, 2.00),
-                        (2500.00,  25.00, 3.00),
-                        (3500.00,  55.00, 4.00),
-                        (5000.00,  95.00, 5.00),
-                        (  'inf', 170.00, 5.75),
-                    ),
-                },
-                'married filing joint, one spouse working': {
-                    'weekly': (
-                        ( 19.00, 0.00, 1.00),
-                        ( 57.50, 0.19, 2.00),
-                        ( 96.00, 0.96, 3.00),
-                        (135.00, 2.12, 4.00),
-                        (192.50, 3.65, 5.00),
-                        ( 'inf', 6.54, 5.75),
-                    ),
-                    'bi-weekly': (
-                        ( 38.50,  0.00, 1.00),
-                        (115.00,  0.38, 2.00),
-                        (192.00,  1.92, 3.00),
-                        (269.00,  4.23, 4.00),
-                        (385.00,  7.31, 5.00),
-                        ( 'inf', 13.08, 5.75),
-                    ),
-                    'semi-monthly': (
-                        ( 41.50,  0.00, 1.00),
-                        (125.00,  0.42, 2.00),
-                        (208.00,  2.08, 3.00),
-                        (292.00,  4.58, 4.00),
-                        (417.00,  7.92, 5.00),
-                        ( 'inf', 14.17, 5.75),
-                    ),
-                    'monthly': (
-                        ( 83.00,  0.00, 1.00),
-                        (250.00,  0.83, 2.00),
-                        (417.00,  4.17, 3.00),
-                        (583.00,  9.17, 4.00),
-                        (833.00, 15.83, 5.00),
-                        ( 'inf', 28.33, 5.75),
-                    ),
-                    'quarterly': (
-                        ( 250.00,  0.00, 1.00),
-                        ( 750.00,  2.50, 2.00),
-                        (1250.00, 12.50, 3.00),
-                        (1750.00, 27.50, 4.00),
-                        (2500.00, 47.50, 5.00),
-                        (  'inf', 85.00, 5.75),
-                    ),
-                    'semi-annual': (
-                        ( 500.00,   0.00, 1.00),
-                        (1500.00,   5.00, 2.00),
-                        (2500.00,  25.00, 3.00),
-                        (3500.00,  55.00, 4.00),
-                        (5000.00,  95.00, 5.00),
-                        (  'inf', 170.00, 5.75),
-                    ),
-                    'annual': (
-                        ( 1000.00,   0.00, 1.00),
-                        ( 3000.00,  10.00, 2.00),
-                        ( 5000.00,  50.00, 3.00),
-                        ( 7000.00, 110.00, 4.00),
-                        (10000.00, 190.00, 5.00),
-                        (   'inf', 340.00, 5.75),
-                    ),
-                },
-                'single': {
-                    'weekly': (
-                        ( 14.50, 0.00, 1.00),
-                        ( 43.50, 0.14, 2.00),
-                        ( 72.00, 0.72, 3.00),
-                        (101.00, 1.59, 4.00),
-                        (135.00, 2.74, 5.00),
-                        ( 'inf', 4.42, 5.75),
-                    ),
-                    'bi-weekly': (
-                        ( 29.00, 0.00, 1.00),
-                        ( 86.50, 0.29, 2.00),
-                        (144.00, 1.44, 3.00),
-                        (202.00, 3.17, 4.00),
-                        (269.00, 5.48, 5.00),
-                        ( 'inf', 8.85, 5.75),
-                    ),
-                    'semi-monthly': (
-                        ( 31.00, 0.00, 1.00),
-                        ( 93.50, 0.31, 2.00),
-                        (156.00, 1.56, 3.00),
-                        (219.00, 3.34, 4.00),
-                        (292.00, 5.94, 5.00),
-                        ( 'inf', 9.58, 5.75),
-                    ),
-                    'monthly': (
-                        ( 62.50,  0.00, 1.00),
-                        (187.00,  0.62, 2.00),
-                        (312.00,  3.12, 3.00),
-                        (437.00,  6.87, 4.00),
-                        (583.00, 11.87, 5.00),
-                        ( 'inf', 19.17, 5.75),
-                    ),
-                    'quarterly': (
-                        ( 187.50,  0.00, 1.00),
-                        ( 562.50,  1.88, 2.00),
-                        ( 937.50,  9.38, 3.00),
-                        (1312.00, 20.63, 4.00),
-                        (1750.00, 35.63, 5.00),
-                        (  'inf', 57.50, 5.75),
-                    ),
-                    'semi-annual': (
-                        ( 375.00,   0.00, 1.00),
-                        (1125.00,   3.75, 2.00),
-                        (1875.00,  18.75, 3.00),
-                        (2625.00,  41.25, 4.00),
-                        (3500.00,  71.25, 5.00),
-                        (  'inf', 115.00, 5.75),
-                    ),
-                    'annual': (
-                        ( 750.00,   0.00, 1.00),
-                        (2250.00,   7.50, 2.00),
-                        (3750.00,  37.50, 3.00),
-                        (5250.00,  82.50, 4.00),
-                        (7000.00, 142.50, 5.00),
-                        (  'inf', 230.00, 5.75),
-                    ),
-                },
-                'head of household': {
-                    'weekly': (
-                        ( 19.00, 0.00, 1.00),
-                        ( 57.50, 0.19, 2.00),
-                        ( 96.00, 0.96, 3.00),
-                        (135.00, 2.12, 4.00),
-                        (192.50, 3.65, 5.00),
-                        ( 'inf', 6.54, 5.75),
-                    ),
-                    'bi-weekly': (
-                        ( 38.50,  0.00, 1.00),
-                        (115.00,  0.38, 2.00),
-                        (192.00,  1.92, 3.00),
-                        (269.00,  4.23, 4.00),
-                        (385.00,  7.31, 5.00),
-                        ( 'inf', 13.08, 5.75),
-                    ),
-                    'semi-monthly': (
-                        ( 41.50,  0.00, 1.00),
-                        (125.00,  0.42, 2.00),
-                        (208.00,  2.08, 3.00),
-                        (292.00,  4.58, 4.00),
-                        (417.00,  7.92, 5.00),
-                        ( 'inf', 14.17, 5.75),
-                    ),
-                    'monthly': (
-                        ( 83.00,  0.00, 1.00),
-                        (250.00,  0.83, 2.00),
-                        (417.00,  4.17, 3.00),
-                        (583.00,  9.17, 4.00),
-                        (833.00, 15.83, 5.00),
-                        ( 'inf', 28.33, 5.75),
-                    ),
-                    'quarterly': (
-                        ( 250.00,  0.00, 1.00),
-                        ( 750.00,  2.50, 2.00),
-                        (1250.00, 12.50, 3.00),
-                        (1750.00, 27.50, 4.00),
-                        (2500.00, 47.50, 5.00),
-                        (  'inf', 85.00, 5.75),
-                    ),
-                    'semi-annual': (
-                        ( 500.00,   0.00, 1.00),
-                        (1500.00,   5.00, 2.00),
-                        (2500.00,  25.00, 3.00),
-                        (3500.00,  55.00, 4.00),
-                        (5000.00,  95.00, 5.00),
-                        (  'inf', 170.00, 5.75),
-                    ),
-                    'annual': (
-                        ( 1000.00,   0.00, 1.00),
-                        ( 3000.00,  10.00, 2.00),
-                        ( 5000.00,  50.00, 3.00),
-                        ( 7000.00, 110.00, 4.00),
-                        (10000.00, 190.00, 5.00),
-                        (   'inf', 340.00, 5.75),
-                    ),
-                },
-                'married filing separate': {
-                    'weekly': (
-                        ( 9.50, 0.00, 1.00),
-                        (29.00, 0.10, 2.00),
-                        (48.00, 0.48, 3.00),
-                        (67.50, 1.06, 4.00),
-                        (96.00, 1.83, 5.00),
-                        ('inf', 3.27, 5.75),
-                    ),
-                    'bi-weekly': (
-                        ( 19.00, 0.00, 1.00),
-                        ( 57.50, 0.19, 2.00),
-                        ( 96.00, 0.96, 3.00),
-                        (135.00, 2.12, 4.00),
-                        (192.00, 3.65, 5.00),
-                        ( 'inf', 6.54, 5.75),
-                    ),
-                    'semi-monthly': (
-                        ( 21.00, 0.00, 1.00),
-                        ( 62.50, 0.21, 2.00),
-                        (104.00, 1.04, 3.00),
-                        (146.00, 2.29, 4.00),
-                        (208.00, 3.96, 5.00),
-                        ( 'inf', 7.08, 5.75),
-                    ),
-                    'monthly': (
-                        ( 41.50,  0.00, 1.00),
-                        (125.50,  0.42, 2.00),
-                        (208.00,  2.08, 3.00),
-                        (292.00,  4.58, 4.00),
-                        (417.00,  7.92, 5.00),
-                        ( 'inf', 14.17, 5.75),
-                    ),
-                    'quarterly': (
-                        ( 125.00,  0.00, 1.00),
-                        ( 375.00,  1.25, 2.00),
-                        ( 625.00,  6.25, 3.00),
-                        ( 875.00, 13.75, 4.00),
-                        (1250.00, 23.75, 5.00),
-                        (  'inf', 42.50, 5.75),
-                    ),
-                    'semi-annual': (
-                        ( 250.00,  0.00, 1.00),
-                        ( 750.00,  2.50, 2.00),
-                        (1250.00, 12.50, 3.00),
-                        (1750.00, 27.50, 4.00),
-                        (2500.00, 47.50, 5.00),
-                        (  'inf', 85.00, 5.75),
-                    ),
-                    'annual': (
-                        ( 500.00,   0.00, 1.00),
-                        (1500.00,   5.00, 2.00),
-                        (2500.00,  25.00, 3.00),
-                        (3500.00,  55.00, 4.00),
-                        (5000.00,  95.00, 5.00),
-                        (  'inf', 170.00, 5.75),
-                    ),
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ga_sit_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ga_sit_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'married filing joint, both spouses working': {
+                'weekly': (
+                    ( 9.50, 0.00, 1.00),
+                    (29.00, 0.10, 2.00),
+                    (48.00, 0.48, 3.00),
+                    (67.50, 1.06, 4.00),
+                    (96.00, 1.83, 5.00),
+                    ('inf', 3.27, 5.75),
+                ),
+                'bi-weekly': (
+                    ( 19.00, 0.00, 1.00),
+                    ( 57.50, 0.19, 2.00),
+                    ( 96.00, 0.96, 3.00),
+                    (135.00, 2.12, 4.00),
+                    (192.00, 3.65, 5.00),
+                    ( 'inf', 6.54, 5.75),
+                ),
+                'semi-monthly': (
+                    ( 21.00, 0.00, 1.00),
+                    ( 62.50, 0.21, 2.00),
+                    (104.00, 1.04, 3.00),
+                    (146.00, 2.29, 4.00),
+                    (208.00, 3.96, 5.00),
+                    ( 'inf', 7.08, 5.75),
+                ),
+                'monthly': (
+                    ( 41.50,  0.00, 1.00),
+                    (125.50,  0.42, 2.00),
+                    (208.00,  2.08, 3.00),
+                    (292.00,  4.58, 4.00),
+                    (417.00,  7.92, 5.00),
+                    ( 'inf', 14.17, 5.75),
+                ),
+                'quarterly': (
+                    ( 125.00,  0.00, 1.00),
+                    ( 375.00,  1.25, 2.00),
+                    ( 625.00,  6.25, 3.00),
+                    ( 875.00, 13.75, 4.00),
+                    (1250.00, 23.75, 5.00),
+                    (  'inf', 42.50, 5.75),
+                ),
+                'semi-annual': (
+                    ( 250.00,  0.00, 1.00),
+                    ( 750.00,  2.50, 2.00),
+                    (1250.00, 12.50, 3.00),
+                    (1750.00, 27.50, 4.00),
+                    (2500.00, 47.50, 5.00),
+                    (  'inf', 85.00, 5.75),
+                ),
+                'annual': (
+                    ( 500.00,   0.00, 1.00),
+                    (1500.00,   5.00, 2.00),
+                    (2500.00,  25.00, 3.00),
+                    (3500.00,  55.00, 4.00),
+                    (5000.00,  95.00, 5.00),
+                    (  'inf', 170.00, 5.75),
+                ),
+            },
+            'married filing joint, one spouse working': {
+                'weekly': (
+                    ( 19.00, 0.00, 1.00),
+                    ( 57.50, 0.19, 2.00),
+                    ( 96.00, 0.96, 3.00),
+                    (135.00, 2.12, 4.00),
+                    (192.50, 3.65, 5.00),
+                    ( 'inf', 6.54, 5.75),
+                ),
+                'bi-weekly': (
+                    ( 38.50,  0.00, 1.00),
+                    (115.00,  0.38, 2.00),
+                    (192.00,  1.92, 3.00),
+                    (269.00,  4.23, 4.00),
+                    (385.00,  7.31, 5.00),
+                    ( 'inf', 13.08, 5.75),
+                ),
+                'semi-monthly': (
+                    ( 41.50,  0.00, 1.00),
+                    (125.00,  0.42, 2.00),
+                    (208.00,  2.08, 3.00),
+                    (292.00,  4.58, 4.00),
+                    (417.00,  7.92, 5.00),
+                    ( 'inf', 14.17, 5.75),
+                ),
+                'monthly': (
+                    ( 83.00,  0.00, 1.00),
+                    (250.00,  0.83, 2.00),
+                    (417.00,  4.17, 3.00),
+                    (583.00,  9.17, 4.00),
+                    (833.00, 15.83, 5.00),
+                    ( 'inf', 28.33, 5.75),
+                ),
+                'quarterly': (
+                    ( 250.00,  0.00, 1.00),
+                    ( 750.00,  2.50, 2.00),
+                    (1250.00, 12.50, 3.00),
+                    (1750.00, 27.50, 4.00),
+                    (2500.00, 47.50, 5.00),
+                    (  'inf', 85.00, 5.75),
+                ),
+                'semi-annual': (
+                    ( 500.00,   0.00, 1.00),
+                    (1500.00,   5.00, 2.00),
+                    (2500.00,  25.00, 3.00),
+                    (3500.00,  55.00, 4.00),
+                    (5000.00,  95.00, 5.00),
+                    (  'inf', 170.00, 5.75),
+                ),
+                'annual': (
+                    ( 1000.00,   0.00, 1.00),
+                    ( 3000.00,  10.00, 2.00),
+                    ( 5000.00,  50.00, 3.00),
+                    ( 7000.00, 110.00, 4.00),
+                    (10000.00, 190.00, 5.00),
+                    (   'inf', 340.00, 5.75),
+                ),
+            },
+            'single': {
+                'weekly': (
+                    ( 14.50, 0.00, 1.00),
+                    ( 43.50, 0.14, 2.00),
+                    ( 72.00, 0.72, 3.00),
+                    (101.00, 1.59, 4.00),
+                    (135.00, 2.74, 5.00),
+                    ( 'inf', 4.42, 5.75),
+                ),
+                'bi-weekly': (
+                    ( 29.00, 0.00, 1.00),
+                    ( 86.50, 0.29, 2.00),
+                    (144.00, 1.44, 3.00),
+                    (202.00, 3.17, 4.00),
+                    (269.00, 5.48, 5.00),
+                    ( 'inf', 8.85, 5.75),
+                ),
+                'semi-monthly': (
+                    ( 31.00, 0.00, 1.00),
+                    ( 93.50, 0.31, 2.00),
+                    (156.00, 1.56, 3.00),
+                    (219.00, 3.34, 4.00),
+                    (292.00, 5.94, 5.00),
+                    ( 'inf', 9.58, 5.75),
+                ),
+                'monthly': (
+                    ( 62.50,  0.00, 1.00),
+                    (187.00,  0.62, 2.00),
+                    (312.00,  3.12, 3.00),
+                    (437.00,  6.87, 4.00),
+                    (583.00, 11.87, 5.00),
+                    ( 'inf', 19.17, 5.75),
+                ),
+                'quarterly': (
+                    ( 187.50,  0.00, 1.00),
+                    ( 562.50,  1.88, 2.00),
+                    ( 937.50,  9.38, 3.00),
+                    (1312.00, 20.63, 4.00),
+                    (1750.00, 35.63, 5.00),
+                    (  'inf', 57.50, 5.75),
+                ),
+                'semi-annual': (
+                    ( 375.00,   0.00, 1.00),
+                    (1125.00,   3.75, 2.00),
+                    (1875.00,  18.75, 3.00),
+                    (2625.00,  41.25, 4.00),
+                    (3500.00,  71.25, 5.00),
+                    (  'inf', 115.00, 5.75),
+                ),
+                'annual': (
+                    ( 750.00,   0.00, 1.00),
+                    (2250.00,   7.50, 2.00),
+                    (3750.00,  37.50, 3.00),
+                    (5250.00,  82.50, 4.00),
+                    (7000.00, 142.50, 5.00),
+                    (  'inf', 230.00, 5.75),
+                ),
+            },
+            'head of household': {
+                'weekly': (
+                    ( 19.00, 0.00, 1.00),
+                    ( 57.50, 0.19, 2.00),
+                    ( 96.00, 0.96, 3.00),
+                    (135.00, 2.12, 4.00),
+                    (192.50, 3.65, 5.00),
+                    ( 'inf', 6.54, 5.75),
+                ),
+                'bi-weekly': (
+                    ( 38.50,  0.00, 1.00),
+                    (115.00,  0.38, 2.00),
+                    (192.00,  1.92, 3.00),
+                    (269.00,  4.23, 4.00),
+                    (385.00,  7.31, 5.00),
+                    ( 'inf', 13.08, 5.75),
+                ),
+                'semi-monthly': (
+                    ( 41.50,  0.00, 1.00),
+                    (125.00,  0.42, 2.00),
+                    (208.00,  2.08, 3.00),
+                    (292.00,  4.58, 4.00),
+                    (417.00,  7.92, 5.00),
+                    ( 'inf', 14.17, 5.75),
+                ),
+                'monthly': (
+                    ( 83.00,  0.00, 1.00),
+                    (250.00,  0.83, 2.00),
+                    (417.00,  4.17, 3.00),
+                    (583.00,  9.17, 4.00),
+                    (833.00, 15.83, 5.00),
+                    ( 'inf', 28.33, 5.75),
+                ),
+                'quarterly': (
+                    ( 250.00,  0.00, 1.00),
+                    ( 750.00,  2.50, 2.00),
+                    (1250.00, 12.50, 3.00),
+                    (1750.00, 27.50, 4.00),
+                    (2500.00, 47.50, 5.00),
+                    (  'inf', 85.00, 5.75),
+                ),
+                'semi-annual': (
+                    ( 500.00,   0.00, 1.00),
+                    (1500.00,   5.00, 2.00),
+                    (2500.00,  25.00, 3.00),
+                    (3500.00,  55.00, 4.00),
+                    (5000.00,  95.00, 5.00),
+                    (  'inf', 170.00, 5.75),
+                ),
+                'annual': (
+                    ( 1000.00,   0.00, 1.00),
+                    ( 3000.00,  10.00, 2.00),
+                    ( 5000.00,  50.00, 3.00),
+                    ( 7000.00, 110.00, 4.00),
+                    (10000.00, 190.00, 5.00),
+                    (   'inf', 340.00, 5.75),
+                ),
+            },
+            'married filing separate': {
+                'weekly': (
+                    ( 9.50, 0.00, 1.00),
+                    (29.00, 0.10, 2.00),
+                    (48.00, 0.48, 3.00),
+                    (67.50, 1.06, 4.00),
+                    (96.00, 1.83, 5.00),
+                    ('inf', 3.27, 5.75),
+                ),
+                'bi-weekly': (
+                    ( 19.00, 0.00, 1.00),
+                    ( 57.50, 0.19, 2.00),
+                    ( 96.00, 0.96, 3.00),
+                    (135.00, 2.12, 4.00),
+                    (192.00, 3.65, 5.00),
+                    ( 'inf', 6.54, 5.75),
+                ),
+                'semi-monthly': (
+                    ( 21.00, 0.00, 1.00),
+                    ( 62.50, 0.21, 2.00),
+                    (104.00, 1.04, 3.00),
+                    (146.00, 2.29, 4.00),
+                    (208.00, 3.96, 5.00),
+                    ( 'inf', 7.08, 5.75),
+                ),
+                'monthly': (
+                    ( 41.50,  0.00, 1.00),
+                    (125.50,  0.42, 2.00),
+                    (208.00,  2.08, 3.00),
+                    (292.00,  4.58, 4.00),
+                    (417.00,  7.92, 5.00),
+                    ( 'inf', 14.17, 5.75),
+                ),
+                'quarterly': (
+                    ( 125.00,  0.00, 1.00),
+                    ( 375.00,  1.25, 2.00),
+                    ( 625.00,  6.25, 3.00),
+                    ( 875.00, 13.75, 4.00),
+                    (1250.00, 23.75, 5.00),
+                    (  'inf', 42.50, 5.75),
+                ),
+                'semi-annual': (
+                    ( 250.00,  0.00, 1.00),
+                    ( 750.00,  2.50, 2.00),
+                    (1250.00, 12.50, 3.00),
+                    (1750.00, 27.50, 4.00),
+                    (2500.00, 47.50, 5.00),
+                    (  'inf', 85.00, 5.75),
+                ),
+                'annual': (
+                    ( 500.00,   0.00, 1.00),
+                    (1500.00,   5.00, 2.00),
+                    (2500.00,  25.00, 3.00),
+                    (3500.00,  55.00, 4.00),
+                    (5000.00,  95.00, 5.00),
+                    (  'inf', 170.00, 5.75),
+                ),
+            },
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ga_sit_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
     
     <record id="rule_parameter_us_ga_sit_personal_allowance" model="hr.rule.parameter">
         <field name="name">US GA Georgia SIT Personal Allowance</field>
         <field name="code">us_ga_sit_personal_allowance</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- https://dor.georgia.gov/employers-tax-guide File 2020 -->
-        <!-- Table E Column 4. 5. 6.-->
-        <!-- Not changed in 2021 https://dor.georgia.gov/employers-tax-guide File 2021 -->
-        <record id="rule_parameter_us_ga_sit_personal_allowance_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'married filing joint, both spouses working': {
-                    'weekly':        142.30,
-                    'bi-weekly':     284.62,
-                    'semi-monthly':  308.33,
-                    'monthly':       616.67,
-                    'quarterly':    1850.00,
-                    'semi-annual':  3700.00,
-                    'annual':       7400.00,
-                },
-                'married filing joint, one spouse working': {
-                    'weekly':        142.30,
-                    'bi-weekly':     284.62,
-                    'semi-monthly':  308.33,
-                    'monthly':       616.67,
-                    'quarterly':    1850.00,
-                    'semi-annual':  3700.00,
-                    'annual':       7400.00,
-                },
-                'single': {
-                    'weekly':         51.92,
-                    'bi-weekly':     103.85,
-                    'semi-monthly':  112.50,
-                    'monthly':       225.00,
-                    'quarterly':     675.00,
-                    'semi-annual':  1350.00,
-                    'annual':       2700.00,
-                },
-                'head of household': {
-                    'weekly':         51.92,
-                    'bi-weekly':     103.85,
-                    'semi-monthly':  112.50,
-                    'monthly':       225.00,
-                    'quarterly':     675.00,
-                    'semi-annual':  1350.00,
-                    'annual':       2700.00,
-                },
-                'married filing separate': {
-                    'weekly':         71.15,
-                    'bi-weekly':     142.30,
-                    'semi-monthly':  154.16,
-                    'monthly':       308.33,
-                    'quarterly':     925.00,
-                    'semi-annual':  1850.00,
-                    'annual':       3700.00,
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ga_sit_personal_allowance"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ga_sit_personal_allowance_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'married filing joint, both spouses working': {
+                'weekly':        142.30,
+                'bi-weekly':     284.62,
+                'semi-monthly':  308.33,
+                'monthly':       616.67,
+                'quarterly':    1850.00,
+                'semi-annual':  3700.00,
+                'annual':       7400.00,
+            },
+            'married filing joint, one spouse working': {
+                'weekly':        142.30,
+                'bi-weekly':     284.62,
+                'semi-monthly':  308.33,
+                'monthly':       616.67,
+                'quarterly':    1850.00,
+                'semi-annual':  3700.00,
+                'annual':       7400.00,
+            },
+            'single': {
+                'weekly':         51.92,
+                'bi-weekly':     103.85,
+                'semi-monthly':  112.50,
+                'monthly':       225.00,
+                'quarterly':     675.00,
+                'semi-annual':  1350.00,
+                'annual':       2700.00,
+            },
+            'head of household': {
+                'weekly':         51.92,
+                'bi-weekly':     103.85,
+                'semi-monthly':  112.50,
+                'monthly':       225.00,
+                'quarterly':     675.00,
+                'semi-annual':  1350.00,
+                'annual':       2700.00,
+            },
+            'married filing separate': {
+                'weekly':         71.15,
+                'bi-weekly':     142.30,
+                'semi-monthly':  154.16,
+                'monthly':       308.33,
+                'quarterly':     925.00,
+                'semi-annual':  1850.00,
+                'annual':       3700.00,
+            },
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ga_sit_personal_allowance"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_ga_sit_dependent_allowance_rate" model="hr.rule.parameter">
         <field name="name">US GA Georgia SIT Dependent Allowance Rate</field>
         <field name="code">us_ga_sit_dependent_allowance_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- https://dor.georgia.gov/employers-tax-guide File 2020 -->
-        <!-- Table E Column 7.-->
-        <!-- Not changed in 2021 https://dor.georgia.gov/employers-tax-guide File 2021 -->
-        <record id="rule_parameter_us_ga_sit_dependent_allowance_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly':         57.50,
-                'bi-weekly':     115.00,
-                'semi-monthly':  125.00,
-                'monthly':       250.00,
-                'quarterly':     750.00,
-                'semi-annual':  1500.00,
-                'annual':       3000.00,
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ga_sit_dependent_allowance_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ga_sit_dependent_allowance_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'weekly':         57.50,
+            'bi-weekly':     115.00,
+            'semi-monthly':  125.00,
+            'monthly':       250.00,
+            'quarterly':     750.00,
+            'semi-annual':  1500.00,
+            'annual':       3000.00,
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ga_sit_dependent_allowance_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_ga_sit_deduction" model="hr.rule.parameter">
         <field name="name">US GA Georgia SIT Deduction</field>
         <field name="code">us_ga_sit_deduction</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- https://dor.georgia.gov/employers-tax-guide File 2020 -->
-        <!-- Table E Column 1. 2. 3.-->
-        <!-- Not changed in 2021 https://dor.georgia.gov/employers-tax-guide File 2021 -->
-        <record id="rule_parameter_us_ga_sit_deduction_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'married filing joint, both spouses working': {
-                    'weekly':        115.50,
-                    'bi-weekly':     230.75,
-                    'semi-monthly':  250.00,
-                    'monthly':       500.00,
-                    'quarterly':    1500.00,
-                    'semi-annual':  3000.00,
-                    'annual':       6000.00,
-                },
-                'married filing joint, one spouse working': {
-                    'weekly':        115.50,
-                    'bi-weekly':     230.75,
-                    'semi-monthly':  250.00,
-                    'monthly':       500.00,
-                    'quarterly':    1500.00,
-                    'semi-annual':  3000.00,
-                    'annual':       6000.00,
-                },
-                'single': {
-                    'weekly':         88.50,
-                    'bi-weekly':     177.00,
-                    'semi-monthly':  191.75,
-                    'monthly':       383.50,
-                    'quarterly':    1150.00,
-                    'semi-annual':  2300.00,
-                    'annual':       4600.00,
-                },
-                'head of household': {
-                    'weekly':         88.50,
-                    'bi-weekly':     177.00,
-                    'semi-monthly':  191.75,
-                    'monthly':       383.50,
-                    'quarterly':    1150.00,
-                    'semi-annual':  2300.00,
-                    'annual':       4600.00,
-                },
-                'married filing separate': {
-                    'weekly':         57.75,
-                    'bi-weekly':     115.50,
-                    'semi-monthly':  125.00,
-                    'monthly':       250.00,
-                    'quarterly':     750.00,
-                    'semi-annual':  1500.00,
-                    'annual':       3000.00,
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ga_sit_deduction"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ga_sit_deduction_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'married filing joint, both spouses working': {
+                'weekly':        115.50,
+                'bi-weekly':     230.75,
+                'semi-monthly':  250.00,
+                'monthly':       500.00,
+                'quarterly':    1500.00,
+                'semi-annual':  3000.00,
+                'annual':       6000.00,
+            },
+            'married filing joint, one spouse working': {
+                'weekly':        115.50,
+                'bi-weekly':     230.75,
+                'semi-monthly':  250.00,
+                'monthly':       500.00,
+                'quarterly':    1500.00,
+                'semi-annual':  3000.00,
+                'annual':       6000.00,
+            },
+            'single': {
+                'weekly':         88.50,
+                'bi-weekly':     177.00,
+                'semi-monthly':  191.75,
+                'monthly':       383.50,
+                'quarterly':    1150.00,
+                'semi-annual':  2300.00,
+                'annual':       4600.00,
+            },
+            'head of household': {
+                'weekly':         88.50,
+                'bi-weekly':     177.00,
+                'semi-monthly':  191.75,
+                'monthly':       383.50,
+                'quarterly':    1150.00,
+                'semi-annual':  2300.00,
+                'annual':       4600.00,
+            },
+            'married filing separate': {
+                'weekly':         57.75,
+                'bi-weekly':     115.50,
+                'semi-monthly':  125.00,
+                'monthly':       250.00,
+                'quarterly':     750.00,
+                'semi-annual':  1500.00,
+                'annual':       3000.00,
+            },
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ga_sit_deduction"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_ga_dor" model="res.partner">
diff --git a/l10n_us_hr_payroll/data/state/hi_hawaii.xml b/l10n_us_hr_payroll/data/state/hi_hawaii.xml
index e5011794..0e47eadc 100644
--- a/l10n_us_hr_payroll/data/state/hi_hawaii.xml
+++ b/l10n_us_hr_payroll/data/state/hi_hawaii.xml
@@ -6,19 +6,11 @@
         <field name="code">us_hi_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_hi_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">48100.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_hi_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- https://labor.hawaii.gov/ui/tax-rate-schedule-and-weekly-benefit-amount/ -->
-        <record id="rule_parameter_us_hi_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">47400.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_hi_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_hi_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">48100.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_hi_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_hi_suta_rate" model="hr.rule.parameter">
@@ -32,12 +24,6 @@
             <field name="rule_parameter_id" ref="rule_parameter_us_hi_suta_rate"/>
             <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
         </record>
-        <!-- https://labor.hawaii.gov/ui/tax-rate-schedule-and-weekly-benefit-amount/ -->
-        <record id="rule_parameter_us_hi_suta_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">5.2</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_hi_suta_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
     </data>
 
     <record id="rule_parameter_us_hi_sit_tax_rate" model="hr.rule.parameter">
@@ -45,61 +31,53 @@
         <field name="code">us_hi_sit_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- https://files.hawaii.gov/tax/forms/2018/18table-on.pdf -->
-        <!-- Table from Schedule I, II and III -->
-        <!-- unchanged in 2021 -->
-        <record id="rule_parameter_us_hi_sit_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': (
-                    ( 2400,    0.00, 1.40),
-                    ( 4800,   34.00, 3.20),
-                    ( 9600,  110.00, 5.50),
-                    (14400,  374.00, 6.40),
-                    (19200,  682.00, 6.80),
-                    (24000, 1008.00, 7.20),
-                    (36000, 1354.00, 7.60),
-                    ('inf', 2266.00, 7.90),
-                ),
-                'married': (
-                    ( 4800,    0.00, 1.40),
-                    ( 9600,   67.00, 3.20),
-                    (19200,  221.00, 5.50),
-                    (28800,  749.00, 6.40),
-                    (38400, 1363.00, 6.80),
-                    (48000, 2016.00, 7.20),
-                    (72000, 2707.00, 7.60),
-                    ('inf', 4531.00, 7.90),
-                ),
-                'head_of_household': (
-                    ( 2400,    0.00, 1.40),
-                    ( 4800,   34.00, 3.20),
-                    ( 9600,  110.00, 5.50),
-                    (14400,  374.00, 6.40),
-                    (19200,  682.00, 6.80),
-                    (24000, 1008.00, 7.20),
-                    (36000, 1354.00, 7.60),
-                    ('inf', 2266.00, 7.90),
-                ),
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_hi_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_hi_sit_tax_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'single': (
+                ( 2400,    0.00, 1.40),
+                ( 4800,   34.00, 3.20),
+                ( 9600,  110.00, 5.50),
+                (14400,  374.00, 6.40),
+                (19200,  682.00, 6.80),
+                (24000, 1008.00, 7.20),
+                (36000, 1354.00, 7.60),
+                ('inf', 2266.00, 7.90),
+            ),
+            'married': (
+                ( 4800,    0.00, 1.40),
+                ( 9600,   67.00, 3.20),
+                (19200,  221.00, 5.50),
+                (28800,  749.00, 6.40),
+                (38400, 1363.00, 6.80),
+                (48000, 2016.00, 7.20),
+                (72000, 2707.00, 7.60),
+                ('inf', 4531.00, 7.90),
+            ),
+            'head_of_household': (
+                ( 2400,    0.00, 1.40),
+                ( 4800,   34.00, 3.20),
+                ( 9600,  110.00, 5.50),
+                (14400,  374.00, 6.40),
+                (19200,  682.00, 6.80),
+                (24000, 1008.00, 7.20),
+                (36000, 1354.00, 7.60),
+                ('inf', 2266.00, 7.90),
+            ),
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_hi_sit_tax_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
     
     <record id="rule_parameter_us_hi_sit_personal_exemption_rate" model="hr.rule.parameter">
         <field name="name">US HI Hawaii Personal Exemption Rate</field>
         <field name="code">us_hi_sit_personal_exemption_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- unchanged in 2021 -->
-        <record id="rule_parameter_us_hi_sit_personal_exemption_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">1144</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_hi_sit_personal_exemption_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_hi_sit_personal_exemption_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">1144</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_hi_sit_personal_exemption_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_hi_dor" model="res.partner">
diff --git a/l10n_us_hr_payroll/data/state/ia_iowa.xml b/l10n_us_hr_payroll/data/state/ia_iowa.xml
index 67328363..4783d9ba 100644
--- a/l10n_us_hr_payroll/data/state/ia_iowa.xml
+++ b/l10n_us_hr_payroll/data/state/ia_iowa.xml
@@ -6,18 +6,11 @@
         <field name="code">us_ia_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_ia_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">31600.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ia_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <record id="rule_parameter_us_ia_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">32400.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ia_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ia_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">31600.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ia_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_ia_suta_rate" model="hr.rule.parameter">
@@ -38,215 +31,114 @@
         <field name="code">us_ia_sit_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- https://tax.iowa.gov/sites/default/files/idr/documents/WH/IA%20Withholding%20Formula%20and%20Instructions%20TY2020.pdf -->
-        <!-- Table from page 2.-->
-        <record id="rule_parameter_us_ia_sit_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'daily':        (
-                    (  5.69, 0.0033,  0.00),
-                    ( 11.38, 0.0067,  0.02),
-                    ( 22.76, 0.0225,  0.06),
-                    ( 51.22, 0.0414,  0.32),
-                    ( 85.36, 0.0563,  1.50),
-                    (113.81, 0.0596,  3.42),
-                    (170.71, 0.0625,  5.12),
-                    (256.07, 0.0744,  8.68),
-                    ( 'inf', 0.0853, 15.03),
-                ),
-                'weekly':       (
-                    (  28.46, 0.0033,  0.00),
-                    (  56.90, 0.0067,  0.09),
-                    ( 113.81, 0.0225,  0.28),
-                    ( 256.08, 0.0414,  1.56),
-                    ( 426.79, 0.0563,  7.45),
-                    ( 569.04, 0.0596, 17.06),
-                    ( 853.56, 0.0625, 25.54),
-                    (1280.35, 0.0744, 43.32),
-                    (  'inf', 0.0853, 75.07),
-                ),
-                'bi-weekly':    (
-                    (  56.92, 0.0033,   0.00),
-                    ( 113.81, 0.0067,   0.19),
-                    ( 227.62, 0.0225,   0.57),
-                    ( 512.15, 0.0414,   3.13),
-                    ( 853.58, 0.0563,  14.91),
-                    (1138.08, 0.0596,  34.13),
-                    (1707.12, 0.0625,  51.09),
-                    (2560.69, 0.0744,  86.66),
-                    (  'inf', 0.0853, 150.17),
-                ),
-                'semi-monthly': (
-                    (  61.67, 0.0033,   0.00),
-                    (  23.29, 0.0067,   0.20),
-                    ( 246.58, 0.0225,   0.61),
-                    ( 554.83, 0.0414,   3.38),
-                    ( 924.71, 0.0563,  16.14),
-                    (1232.92, 0.0596,  36.96),
-                    (1849.38, 0.0625,  55.33),
-                    (2774.08, 0.0744,  93.86),
-                    (  'inf', 0.0853, 162.66),
-                ),
-                'monthly':      (
-                    ( 123.33, 0.0033,   0.00),
-                    ( 246.58, 0.0067,   0.41),
-                    ( 493.17, 0.0225,   1.24),
-                    (1109.67, 0.0414,   6.79),
-                    (1849.42, 0.0563,  32.31),
-                    (2465.83, 0.0596,  73.96),
-                    (3698.75, 0.0625, 110.70),
-                    (5548.17, 0.0744, 187.76),
-                    (  'inf', 0.0853, 325.36),
-                ),
-                'annual':       (
-                    ( 1480.00, 0.0033,    0.00),
-                    ( 2959.00, 0.0067,    4.88),
-                    ( 5918.00, 0.0225,   14.79),
-                    (13316.00, 0.0414,   81.37),
-                    (22193.00, 0.0563,  387.65),
-                    (29590.00, 0.0596,  887.43),
-                    (44385.00, 0.0625, 1328.29),
-                    (66578.00, 0.0744, 2252.98),
-                    (   'inf', 0.0853, 3904.14),
-                ),
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ia_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- https://tax.iowa.gov/sites/default/files/idr/documents/WH/IA%20Withholding%20Formula%20and%20Instructions%20TY2021.pdf -->
-        <!-- Table from page 2.-->
-        <record id="rule_parameter_us_ia_sit_tax_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly':       (
-                    (  32.23, 0.0033,  0.00),
-                    (  64.46, 0.0067,  0.11),
-                    ( 128.92, 0.0225,  0.33),
-                    ( 290.08, 0.0414,  1.78),
-                    ( 483.46, 0.0563,  8.45),
-                    ( 644.62, 0.0596, 19.34),
-                    ( 966.92, 0.0625, 28.95),
-                    (1450.38, 0.0744, 49.09),
-                    (  'inf', 0.0853, 85.06),
-                ),
-                'bi-weekly':    (
-                    (  64.46, 0.0033,   0.00),
-                    ( 128.92, 0.0067,   0.21),
-                    ( 257.85, 0.0225,   0.64),
-                    ( 580.15, 0.0414,   3.54),
-                    ( 966.92, 0.0563,  16.88),
-                    (1289.23, 0.0596,  38.66),
-                    (1933.85, 0.0625,  57.87),
-                    (2900.77, 0.0744,  98.16),
-                    (  'inf', 0.0853, 170.10),
-                ),
-                'semi-monthly': (
-                    (  69.83, 0.0033,   0.00),
-                    ( 139.67, 0.0067,   0.23),
-                    ( 279.33, 0.0225,   0.70),
-                    ( 628.50, 0.0414,   3.84),
-                    (1047.50, 0.0563,  18.30),
-                    (1396.67, 0.0596,  41.89),
-                    (2095.00, 0.0625,  62.70),
-                    (3142.50, 0.0744, 106.35),
-                    (  'inf', 0.0853, 184.28),
-                ),
-                'monthly':      (
-                    ( 139.67, 0.0033,   0.00),
-                    ( 279.33, 0.0067,   0.46),
-                    ( 558.67, 0.0225,   1.40),
-                    (1257.00, 0.0414,   7.69),
-                    (2095.00, 0.0563,  36.60),
-                    (2793.33, 0.0596,  83.78),
-                    (4190.00, 0.0625, 125.40),
-                    (6285.00, 0.0744, 212.69),
-                    (  'inf', 0.0853, 368.56),
-                ),
-                'annual':       (
-                    ( 1676.00, 0.0033,    0.00),
-                    ( 3352.00, 0.0067,    5.53),
-                    ( 6704.00, 0.0225,   16.76),
-                    (15084.00, 0.0414,   92.18),
-                    (25140.00, 0.0563,  439.11),
-                    (33520.00, 0.0596, 1005.26),
-                    (50280.00, 0.0625, 1504.71),
-                    (75420.00, 0.0744, 2552.21),
-                    (   'inf', 0.0853, 4422.63),
-                ),
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ia_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ia_sit_tax_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'daily':        (
+                (  5.69, 0.0033,  0.00),
+                ( 11.38, 0.0067,  0.02),
+                ( 22.76, 0.0225,  0.06),
+                ( 51.22, 0.0414,  0.32),
+                ( 85.36, 0.0563,  1.50),
+                (113.81, 0.0596,  3.42),
+                (170.71, 0.0625,  5.12),
+                (256.07, 0.0744,  8.68),
+                ( 'inf', 0.0853, 15.03),
+            ),
+            'weekly':       (
+                (  28.46, 0.0033,  0.00),
+                (  56.90, 0.0067,  0.09),
+                ( 113.81, 0.0225,  0.28),
+                ( 256.08, 0.0414,  1.56),
+                ( 426.79, 0.0563,  7.45),
+                ( 569.04, 0.0596, 17.06),
+                ( 853.56, 0.0625, 25.54),
+                (1280.35, 0.0744, 43.32),
+                (  'inf', 0.0853, 75.07),
+            ),
+            'bi-weekly':    (
+                (  56.92, 0.0033,   0.00),
+                ( 113.81, 0.0067,   0.19),
+                ( 227.62, 0.0225,   0.57),
+                ( 512.15, 0.0414,   3.13),
+                ( 853.58, 0.0563,  14.91),
+                (1138.08, 0.0596,  34.13),
+                (1707.12, 0.0625,  51.09),
+                (2560.69, 0.0744,  86.66),
+                (  'inf', 0.0853, 150.17),
+            ),
+            'semi-monthly': (
+                (  61.67, 0.0033,   0.00),
+                (  23.29, 0.0067,   0.20),
+                ( 246.58, 0.0225,   0.61),
+                ( 554.83, 0.0414,   3.38),
+                ( 924.71, 0.0563,  16.14),
+                (1232.92, 0.0596,  36.96),
+                (1849.38, 0.0625,  55.33),
+                (2774.08, 0.0744,  93.86),
+                (  'inf', 0.0853, 162.66),
+            ),
+            'monthly':      (
+                ( 123.33, 0.0033,   0.00),
+                ( 246.58, 0.0067,   0.41),
+                ( 493.17, 0.0225,   1.24),
+                (1109.67, 0.0414,   6.79),
+                (1849.42, 0.0563,  32.31),
+                (2465.83, 0.0596,  73.96),
+                (3698.75, 0.0625, 110.70),
+                (5548.17, 0.0744, 187.76),
+                (  'inf', 0.0853, 325.36),
+            ),
+            'annual':       (
+                ( 1480.00, 0.0033,    0.00),
+                ( 2959.00, 0.0067,    4.88),
+                ( 5918.00, 0.0225,   14.79),
+                (13316.00, 0.0414,   81.37),
+                (22193.00, 0.0563,  387.65),
+                (29590.00, 0.0596,  887.43),
+                (44385.00, 0.0625, 1328.29),
+                (66578.00, 0.0744, 2252.98),
+                (   'inf', 0.0853, 3904.14),
+            ),
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ia_sit_tax_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_ia_sit_standard_deduction_rate" model="hr.rule.parameter">
         <field name="name">US IA Iowa Standard Deduction Rate</field>
         <field name="code">us_ia_sit_standard_deduction_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- https://tax.iowa.gov/sites/default/files/idr/documents/WH/IA%20Withholding%20Formula%20and%20Instructions%20TY2020.pdf-->
-        <!-- Step 2 -->
-        <record id="rule_parameter_us_ia_sit_standard_deduction_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'daily':        (   7.23,   17.81),
-                'weekly':       (  36.15,   89.04),
-                'bi-weekly':    (  72.31,  178.08),
-                'semi-monthly': (  78.33,  192.92),
-                'monthly':      ( 156.67,  385.83),
-                'annually':     (1880.00, 4630.00),
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ia_sit_standard_deduction_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- https://tax.iowa.gov/sites/default/files/idr/documents/WH/IA%20Withholding%20Formula%20and%20Instructions%20TY2021.pdf -->
-        <!-- Step 2 -->
-        <record id="rule_parameter_us_ia_sit_standard_deduction_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly':       (  40.96,  100.77),
-                'bi-weekly':    (  81.92,  201.54),
-                'semi-monthly': (  88.75,  218.33),
-                'monthly':      ( 177.50,  436.67),
-                'annually':     (2130.00, 5240.00),
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ia_sit_standard_deduction_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ia_sit_standard_deduction_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'daily':        (   7.23,   17.81),
+            'weekly':       (  36.15,   89.04),
+            'bi-weekly':    (  72.31,  178.08),
+            'semi-monthly': (  78.33,  192.92),
+            'monthly':      ( 156.67,  385.83),
+            'annually':     (1880.00, 4630.00),
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ia_sit_standard_deduction_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_ia_sit_deduction_allowance_rate" model="hr.rule.parameter">
         <field name="name">US IA Iowa Deduction Allowance Rate</field>
         <field name="code">us_ia_sit_deduction_allowance_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- https://tax.iowa.gov/sites/default/files/idr/documents/WH/IA%20Withholding%20Formula%20and%20Instructions%20TY2020.pdf -->
-        <!-- Step 4 -->
-        <record id="rule_parameter_us_ia_sit_deduction_allowance_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'daily':         0.15,
-                'weekly':        0.77,
-                'bi-weekly':     1.54,
-                'semi-monthly':  1.67,
-                'monthly':       3.33,
-                'annually':     40.00,
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ia_sit_deduction_allowance_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- https://tax.iowa.gov/sites/default/files/idr/documents/WH/IA%20Withholding%20Formula%20and%20Instructions%20TY2021.pdf -->
-        <!-- Step 4 -->
-        <record id="rule_parameter_us_ia_sit_deduction_allowance_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly':        0.77,
-                'bi-weekly':     1.54,
-                'semi-monthly':  1.67,
-                'monthly':       3.33,
-                'annually':     40.00,
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ia_sit_deduction_allowance_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ia_sit_deduction_allowance_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'daily':         0.15,
+            'weekly':        0.77,
+            'bi-weekly':     1.54,
+            'semi-monthly':  1.67,
+            'monthly':       3.33,
+            'annually':     40.00,
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ia_sit_deduction_allowance_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_ia_dor" model="res.partner">
diff --git a/l10n_us_hr_payroll/data/state/id_idaho.xml b/l10n_us_hr_payroll/data/state/id_idaho.xml
index 80995fcc..e80b6880 100644
--- a/l10n_us_hr_payroll/data/state/id_idaho.xml
+++ b/l10n_us_hr_payroll/data/state/id_idaho.xml
@@ -6,18 +6,11 @@
         <field name="code">us_id_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_id_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">41600.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_id_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <record id="rule_parameter_us_id_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">43000.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_id_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_id_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">41600.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_id_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_id_suta_rate" model="hr.rule.parameter">
@@ -26,7 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- Unchanged in 2021 https://www.labor.idaho.gov/dnn/Businesses/Unemployment-Tax-Rates-->
         <record id="rule_parameter_us_id_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">1.0</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_id_suta_rate"/>
@@ -39,195 +31,185 @@
         <field name="code">us_id_sit_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- https://tax.idaho.gov/pubs/EPB00744_06-16-2020.pdf -->
-        <!-- Page 1 to 3 -->
-        <!-- Unchanged in 2021 -->
-        <record id="rule_parameter_us_id_sit_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly': (
-                        (  238,  0.00, 0.000),
-                        (  269,  0.00, 1.125),
-                        (  299,  0.00, 3.125),
-                        (  329,  1.00, 3.625),
-                        (  359,  2.00, 4.625),
-                        (  389,  4.00, 5.625),
-                        (  465,  5.00, 6.625),
-                        ('inf', 10.00, 6.925),
-                    ),
-                    'bi-weekly': (
-                        (  477,  0.00, 0.000),
-                        (  537,  0.00, 1.125),
-                        (  598,  1.00, 3.125),
-                        (  658,  3.00, 3.625),
-                        (  718,  5.00, 4.625),
-                        (  778,  8.00, 5.625),
-                        (  929, 11.00, 6.625),
-                        ('inf', 21.00, 6.925),
-                    ),
-                    'semi-monthly': (
-                        (  517,  0.00, 0.000),
-                        (  582,  0.00, 1.125),
-                        (  647,  1.00, 3.125),
-                        (  713,  3.00, 3.625),
-                        (  778,  5.00, 4.625),
-                        (  843,  8.00, 5.625),
-                        ( 1007, 12.00, 6.625),
-                        ('inf', 23.00, 6.925),
-                    ),
-                    'monthly': (
-                        ( 1033,  0.00, 0.000),
-                        ( 1164,  0.00, 1.125),
-                        ( 1295,  1.00, 3.125),
-                        ( 1425,  6.00, 3.625),
-                        ( 1556, 10.00, 4.625),
-                        ( 1687, 16.00, 5.625),
-                        ( 2013, 24.00, 6.625),
-                        ('inf', 45.00, 6.925),
-                    ),
-                    'annually': (
-                        (12400,   0.00, 0.000),
-                        (13968,   0.00, 1.125),
-                        (15536,  18.00, 3.125),
-                        (17104,  67.00, 3.625),
-                        (18672, 124.00, 4.625),
-                        (20240, 197.00, 5.625),
-                        (24160, 285.00, 6.625),
-                        ('inf', 545.00, 6.925),
-                    ),
-                },
-                'married': {
-                    'weekly': (
-                        (  477,  0.00, 0.000),
-                        (  537,  0.00, 1.125),
-                        (  598,  0.00, 3.125),
-                        (  658,  1.00, 3.625),
-                        (  718,  3.00, 4.625),
-                        (  778,  5.00, 5.625),
-                        (  929, 11.00, 6.625),
-                        ('inf', 21.00, 6.925),
-                    ),
-                    'bi-weekly': (
-                        (  954,  0.00, 0.000),
-                        ( 1074,  0.00, 1.125),
-                        ( 1195,  1.00, 3.125),
-                        ( 1316,  5.00, 3.625),
-                        ( 1436,  9.00, 4.625),
-                        ( 1557, 15.00, 5.625),
-                        ( 1858, 22.00, 6.625),
-                        ('inf', 42.00, 6.925),
-                    ),
-                    'semi-monthly': (
-                        ( 1033,  0.00, 0.000),
-                        ( 1164,  0.00, 1.125),
-                        ( 1295,  1.00, 3.125),
-                        ( 1425,  6.00, 3.625),
-                        ( 1556, 10.00, 4.625),
-                        ( 1687, 16.00, 5.625),
-                        ( 2013, 24.00, 6.625),
-                        ('inf', 45.00, 6.925),
-                    ),
-                    'monthly': (
-                        ( 2067,  0.00, 0.000),
-                        ( 2328,  0.00, 1.125),
-                        ( 2589,  3.00, 3.125),
-                        ( 2851, 11.00, 3.625),
-                        ( 3112, 21.00, 4.625),
-                        ( 3373, 33.00, 5.625),
-                        ( 4027, 47.00, 6.625),
-                        ('inf', 91.00, 6.925),
-                    ),
-                    'annually': (
-                        (24400,    0.00, 0.000),
-                        (27482,    0.00, 1.125),
-                        (30562,   35.00, 3.125),
-                        (33644,  131.00, 3.625),
-                        (36724,  243.00, 4.625),
-                        (39806,  385.00, 5.625),
-                        (47508,  558.00, 6.625),
-                        ('inf', 1068.00, 6.925),
-                    ),
-                },
-                'head of household': {
-                    'weekly': (
-                        (  238,  0.00, 0.000),
-                        (  269,  0.00, 1.125),
-                        (  299,  0.00, 3.125),
-                        (  329,  1.00, 3.625),
-                        (  359,  2.00, 4.625),
-                        (  389,  4.00, 5.625),
-                        (  465,  5.00, 6.625),
-                        ('inf', 10.00, 6.925),
-                    ),
-                    'bi-weekly': (
-                        (  477,  0.00, 0.000),
-                        (  537,  0.00, 1.125),
-                        (  598,  1.00, 3.125),
-                        (  658,  3.00, 3.625),
-                        (  718,  5.00, 4.625),
-                        (  778,  8.00, 5.625),
-                        (  929, 11.00, 6.625),
-                        ('inf', 21.00, 6.925),
-                    ),
-                    'semi-monthly': (
-                        (  517,  0.00, 0.000),
-                        (  582,  0.00, 1.125),
-                        (  647,  1.00, 3.125),
-                        (  713,  3.00, 3.625),
-                        (  778,  5.00, 4.625),
-                        (  843,  8.00, 5.625),
-                        ( 1007, 12.00, 6.625),
-                        ('inf', 23.00, 6.925),
-                    ),
-                    'monthly': (
-                        ( 1033,  0.00, 0.000),
-                        ( 1164,  0.00, 1.125),
-                        ( 1295,  1.00, 3.125),
-                        ( 1425,  6.00, 3.625),
-                        ( 1556, 10.00, 4.625),
-                        ( 1687, 16.00, 5.625),
-                        ( 2013, 24.00, 6.625),
-                        ('inf', 45.00, 6.925),
-                    ),
-                    'annually': (
-                        (12400,   0.00, 0.000),
-                        (13968,   0.00, 1.125),
-                        (15536,  18.00, 3.125),
-                        (17104,  67.00, 3.625),
-                        (18672, 124.00, 4.625),
-                        (20240, 197.00, 5.625),
-                        (24160, 285.00, 6.625),
-                        ('inf', 545.00, 6.925),
-                    ),
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_id_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_id_sit_tax_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'single': {
+                'weekly': (
+                    (  238,  0.00, 0.000),
+                    (  269,  0.00, 1.125),
+                    (  299,  0.00, 3.125),
+                    (  329,  1.00, 3.625),
+                    (  359,  2.00, 4.625),
+                    (  389,  4.00, 5.625),
+                    (  465,  5.00, 6.625),
+                    ('inf', 10.00, 6.925),
+                ),
+                'bi-weekly': (
+                    (  477,  0.00, 0.000),
+                    (  537,  0.00, 1.125),
+                    (  598,  1.00, 3.125),
+                    (  658,  3.00, 3.625),
+                    (  718,  5.00, 4.625),
+                    (  778,  8.00, 5.625),
+                    (  929, 11.00, 6.625),
+                    ('inf', 21.00, 6.925),
+                ),
+                'semi-monthly': (
+                    (  517,  0.00, 0.000),
+                    (  582,  0.00, 1.125),
+                    (  647,  1.00, 3.125),
+                    (  713,  3.00, 3.625),
+                    (  778,  5.00, 4.625),
+                    (  843,  8.00, 5.625),
+                    ( 1007, 12.00, 6.625),
+                    ('inf', 23.00, 6.925),
+                ),
+                'monthly': (
+                    ( 1033,  0.00, 0.000),
+                    ( 1164,  0.00, 1.125),
+                    ( 1295,  1.00, 3.125),
+                    ( 1425,  6.00, 3.625),
+                    ( 1556, 10.00, 4.625),
+                    ( 1687, 16.00, 5.625),
+                    ( 2013, 24.00, 6.625),
+                    ('inf', 45.00, 6.925),
+                ),
+                'annually': (
+                    (12400,   0.00, 0.000),
+                    (13968,   0.00, 1.125),
+                    (15536,  18.00, 3.125),
+                    (17104,  67.00, 3.625),
+                    (18672, 124.00, 4.625),
+                    (20240, 197.00, 5.625),
+                    (24160, 285.00, 6.625),
+                    ('inf', 545.00, 6.925),
+                ),
+            },
+            'married': {
+                'weekly': (
+                    (  477,  0.00, 0.000),
+                    (  537,  0.00, 1.125),
+                    (  598,  0.00, 3.125),
+                    (  658,  1.00, 3.625),
+                    (  718,  3.00, 4.625),
+                    (  778,  5.00, 5.625),
+                    (  929, 11.00, 6.625),
+                    ('inf', 21.00, 6.925),
+                ),
+                'bi-weekly': (
+                    (  954,  0.00, 0.000),
+                    ( 1074,  0.00, 1.125),
+                    ( 1195,  1.00, 3.125),
+                    ( 1316,  5.00, 3.625),
+                    ( 1436,  9.00, 4.625),
+                    ( 1557, 15.00, 5.625),
+                    ( 1858, 22.00, 6.625),
+                    ('inf', 42.00, 6.925),
+                ),
+                'semi-monthly': (
+                    ( 1033,  0.00, 0.000),
+                    ( 1164,  0.00, 1.125),
+                    ( 1295,  1.00, 3.125),
+                    ( 1425,  6.00, 3.625),
+                    ( 1556, 10.00, 4.625),
+                    ( 1687, 16.00, 5.625),
+                    ( 2013, 24.00, 6.625),
+                    ('inf', 45.00, 6.925),
+                ),
+                'monthly': (
+                    ( 2067,  0.00, 0.000),
+                    ( 2328,  0.00, 1.125),
+                    ( 2589,  3.00, 3.125),
+                    ( 2851, 11.00, 3.625),
+                    ( 3112, 21.00, 4.625),
+                    ( 3373, 33.00, 5.625),
+                    ( 4027, 47.00, 6.625),
+                    ('inf', 91.00, 6.925),
+                ),
+                'annually': (
+                    (24400,    0.00, 0.000),
+                    (27482,    0.00, 1.125),
+                    (30562,   35.00, 3.125),
+                    (33644,  131.00, 3.625),
+                    (36724,  243.00, 4.625),
+                    (39806,  385.00, 5.625),
+                    (47508,  558.00, 6.625),
+                    ('inf', 1068.00, 6.925),
+                ),
+            },
+            'head of household': {
+                'weekly': (
+                    (  238,  0.00, 0.000),
+                    (  269,  0.00, 1.125),
+                    (  299,  0.00, 3.125),
+                    (  329,  1.00, 3.625),
+                    (  359,  2.00, 4.625),
+                    (  389,  4.00, 5.625),
+                    (  465,  5.00, 6.625),
+                    ('inf', 10.00, 6.925),
+                ),
+                'bi-weekly': (
+                    (  477,  0.00, 0.000),
+                    (  537,  0.00, 1.125),
+                    (  598,  1.00, 3.125),
+                    (  658,  3.00, 3.625),
+                    (  718,  5.00, 4.625),
+                    (  778,  8.00, 5.625),
+                    (  929, 11.00, 6.625),
+                    ('inf', 21.00, 6.925),
+                ),
+                'semi-monthly': (
+                    (  517,  0.00, 0.000),
+                    (  582,  0.00, 1.125),
+                    (  647,  1.00, 3.125),
+                    (  713,  3.00, 3.625),
+                    (  778,  5.00, 4.625),
+                    (  843,  8.00, 5.625),
+                    ( 1007, 12.00, 6.625),
+                    ('inf', 23.00, 6.925),
+                ),
+                'monthly': (
+                    ( 1033,  0.00, 0.000),
+                    ( 1164,  0.00, 1.125),
+                    ( 1295,  1.00, 3.125),
+                    ( 1425,  6.00, 3.625),
+                    ( 1556, 10.00, 4.625),
+                    ( 1687, 16.00, 5.625),
+                    ( 2013, 24.00, 6.625),
+                    ('inf', 45.00, 6.925),
+                ),
+                'annually': (
+                    (12400,   0.00, 0.000),
+                    (13968,   0.00, 1.125),
+                    (15536,  18.00, 3.125),
+                    (17104,  67.00, 3.625),
+                    (18672, 124.00, 4.625),
+                    (20240, 197.00, 5.625),
+                    (24160, 285.00, 6.625),
+                    ('inf', 545.00, 6.925),
+                ),
+            },
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_id_sit_tax_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
     
     <record id="rule_parameter_us_id_sit_ictcat_rate" model="hr.rule.parameter">
         <field name="name">US ID Idaho Child Tax Credit Allowance Rate</field>
         <field name="code">us_id_sit_ictcat_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- https://tax.idaho.gov/i-1026.cfm?seg=compute -->
-        <!-- Idaho Child Tax Credit Allowances Table -->
-        <!-- Unchanged in 2021 -->
-        <record id="rule_parameter_us_id_sit_ictcat_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly':        56.92,
-                'bi-weekly':    113.85,
-                'semi-monthly': 123.33,
-                'monthly':      246.67,
-                'annually':    2960.00,
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_id_sit_ictcat_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_id_sit_ictcat_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'weekly':        56.92,
+            'bi-weekly':    113.85,
+            'semi-monthly': 123.33,
+            'monthly':      246.67,
+            'annually':    2960.00,
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_id_sit_ictcat_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
 
     <!-- Partners and Contribution Registers -->
diff --git a/l10n_us_hr_payroll/data/state/il_illinois.xml b/l10n_us_hr_payroll/data/state/il_illinois.xml
index ccc6e314..b1c68a36 100644
--- a/l10n_us_hr_payroll/data/state/il_illinois.xml
+++ b/l10n_us_hr_payroll/data/state/il_illinois.xml
@@ -6,19 +6,11 @@
         <field name="code">us_il_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_il_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">12740.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_il_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- https://www2.illinois.gov/ides/IDES%20Forms%20and%20Publications/UITaxRates.pdf -->
-        <record id="rule_parameter_us_il_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">12960.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_il_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_il_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">12740.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_il_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_il_suta_rate" model="hr.rule.parameter">
@@ -32,12 +24,6 @@
             <field name="rule_parameter_id" ref="rule_parameter_us_il_suta_rate"/>
             <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
         </record>
-        <!-- https://www2.illinois.gov/ides/IDES%20Forms%20and%20Publications/UITaxRates.pdf -->
-        <record id="rule_parameter_us_il_suta_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">3.175</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_il_suta_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
     </data>
 
     <record id="rule_parameter_us_il_sit_basic_allowances_rate" model="hr.rule.parameter">
@@ -45,33 +31,22 @@
         <field name="code">us_il_sit_basic_allowances_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_il_sit_basic_allowances_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">2325.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_il_sit_basic_allowances_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- page 4, step2, a: https://www2.illinois.gov/rev/forms/withholding/Documents/currentyear/il-700-t.pdf -->
-        <record id="rule_parameter_us_il_sit_basic_allowances_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">2375.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_il_sit_basic_allowances_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_il_sit_basic_allowances_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">2325.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_il_sit_basic_allowances_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_il_sit_additional_allowances_rate" model="hr.rule.parameter">
         <field name="name">US IL Illinois Additional Allowances Rate</field>
         <field name="code">us_il_sit_additional_allowances_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-         <!-- page 4, step2, b: https://www2.illinois.gov/rev/forms/withholding/Documents/currentyear/il-700-t.pdf -->
-        <record id="rule_parameter_us_il_sit_additional_allowances_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">1000.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_il_sit_additional_allowances_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_il_sit_additional_allowances_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">1000.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_il_sit_additional_allowances_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_il_dor" model="res.partner">