diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json
index cf59ed4..27f4277 100644
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -66,7 +66,7 @@
       "pop_minus_steps": 1,
       "pop_time_step_config": 1,
       "pop_time_step_config_comment": "STATIC",
-      "pop_allow_overpay": false,
+      "pop_allow_overpay": true,
       "pop_carry_over": 1,
       "pop_business_hours": 0
     }
diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json
index d0176b6..9aff88e 100644
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -66,7 +66,7 @@
       "pop_minus_steps": 1,
       "pop_time_step_config": 1,
       "pop_time_step_config_comment": "STATIC",
-      "pop_allow_overpay": false,
+      "pop_allow_overpay": true,
       "pop_carry_over": 1,
       "pop_business_hours": 0
     }
@@ -986,6 +986,45 @@
     }
   ],
     "Monday" : [{
+        "2025-04-21" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1050,6 +1089,84 @@
         }
     }],
     "Tuesday" : [{
+        "2024-12-24" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-03-11" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1114,6 +1231,84 @@
         }
     }],
     "Wednesday" : [{
+        "2024-12-25" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-01-01" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1178,6 +1373,84 @@
         }
     }],
     "Thursday" : [{
+        "2024-12-26" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-05-01" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1345,6 +1618,45 @@
         }
     }],
     "Saturday" : [{
+        "2024-11-02" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1386,6 +1698,123 @@
         }
     }],
     "Sunday" : [{
+        "2025-02-16" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-04-20" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-05-04" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json
index cfd8afe..eedc1cd 100644
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -1,7 +1,7 @@
 {
   "Project" : "Kleipeda",
   "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
-  "Info"    : "Red Zone (1 machine)",
+  "Info"    : "Red Zone ()",
   "Currency": [
     {
       "pcu_id": 2,
@@ -66,7 +66,7 @@
       "pop_minus_steps": 1,
       "pop_time_step_config": 1,
       "pop_time_step_config_comment": "STATIC",
-      "pop_allow_overpay": false,
+      "pop_allow_overpay": true,
       "pop_carry_over": 1,
       "pop_business_hours": 0
     }
@@ -2186,6 +2186,45 @@
     }
   ],
     "Monday" : [{
+        "2025-04-21" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -2250,6 +2289,84 @@
         }
     }],
     "Tuesday" : [{
+        "2024-12-24" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-03-11" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -2314,6 +2431,84 @@
         }
     }],
     "Wednesday" : [{
+        "2024-12-25" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-01-01" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -2378,6 +2573,84 @@
         }
     }],
     "Thursday" : [{
+        "2024-12-26" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-05-01" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -2545,13 +2818,13 @@
         }
     }],
     "Saturday" : [{
-        "default" : {
+        "2024-11-02" : {
             "payment_settings" : [
                 {
-                    "min_time" : 12,
-                    "max_time" : 840,
-                    "max_price": 2100,
-                    "min_price": 30
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
                 }
             ],
             "prepaid_settings" : [
@@ -2559,14 +2832,8 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 480,
+                            "prepaid_duration": 1440,
                             "prepaid_start" : "00:00:00",
-                            "prepaid_end": "08:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 240,
-                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2578,44 +2845,66 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 480,
+                            "carry_over_duration": 1440,
                             "carry_over_start" : "00:00:00",
-                            "carry_over_end": "08:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 240,
-                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "default" : {
+            "payment_settings" : [
                 {
-                    "service_ranges" : [
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
                         {
-                            "service_id" : 1,
-                            "service_duration": 720,
-                            "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
                         }
                     ]
                 }
             ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
             "out_of_service_settings" : [
 	    ]
         }
     }],
     "Sunday" : [{
-        "default" : {
+        "2025-02-16" : {
             "payment_settings" : [
                 {
-                    "min_time" : 12,
-                    "max_time" : 840,
-                    "max_price": 2100,
-                    "min_price": 30
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
                 }
             ],
             "prepaid_settings" : [
@@ -2623,14 +2912,8 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 480,
+                            "prepaid_duration": 1440,
                             "prepaid_start" : "00:00:00",
-                            "prepaid_end": "08:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 240,
-                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2642,32 +2925,132 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 480,
+                            "carry_over_duration": 1440,
                             "carry_over_start" : "00:00:00",
-                            "carry_over_end": "08:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 240,
-                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-04-20" : {
+            "payment_settings" : [
                 {
-                    "service_ranges" : [
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
                         {
-                            "service_id" : 1,
-                            "service_duration": 720,
-                            "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
                         }
                     ]
                 }
             ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-05-04" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
             "out_of_service_settings" : [
 	    ]
         }
diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json
index bcf5ce8..c29f61b 100644
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
@@ -66,7 +66,7 @@
       "pop_minus_steps": 1,
       "pop_time_step_config": 1,
       "pop_time_step_config_comment": "STATIC",
-      "pop_allow_overpay": false,
+      "pop_allow_overpay": true,
       "pop_carry_over": 1,
       "pop_business_hours": 0
     }
@@ -986,6 +986,45 @@
     }
   ],
     "Monday" : [{
+        "2025-04-21" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1050,6 +1089,84 @@
         }
     }],
     "Tuesday" : [{
+        "2024-12-24" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-03-11" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1114,6 +1231,84 @@
         }
     }],
     "Wednesday" : [{
+        "2024-12-25" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-01-01" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1178,6 +1373,84 @@
         }
     }],
     "Thursday" : [{
+        "2024-12-26" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-05-01" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1345,6 +1618,45 @@
         }
     }],
     "Saturday" : [{
+        "2024-11-02" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1386,6 +1698,123 @@
         }
     }],
     "Sunday" : [{
+        "2025-02-16" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-04-20" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-05-04" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {