diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json
index 7e1df49..faf1ab2 100644
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -2206,6 +2206,12 @@
                         },
                         {
                             "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
                             "prepaid_duration": 240,
                             "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
@@ -2226,6 +2232,13 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
                             "carry_over_duration": 240,
                             "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
@@ -2238,8 +2251,14 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
                             "service_end": "20:00:00"
                         }
                     ]
@@ -2270,6 +2289,12 @@
                         },
                         {
                             "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
                             "prepaid_duration": 240,
                             "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
@@ -2290,6 +2315,13 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
                             "carry_over_duration": 240,
                             "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
@@ -2302,8 +2334,14 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
                             "service_end": "20:00:00"
                         }
                     ]
@@ -2415,6 +2453,12 @@
                         },
                         {
                             "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
                             "prepaid_duration": 240,
                             "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
@@ -2435,6 +2479,13 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
                             "carry_over_duration": 240,
                             "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
@@ -2447,8 +2498,14 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
                             "service_end": "20:00:00"
                         }
                     ]
@@ -2479,6 +2536,12 @@
                         },
                         {
                             "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
                             "prepaid_duration": 240,
                             "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
@@ -2499,6 +2562,13 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
                             "carry_over_duration": 240,
                             "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
@@ -2511,8 +2581,14 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
                             "service_end": "20:00:00"
                         }
                     ]
@@ -2543,6 +2619,12 @@
                         },
                         {
                             "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
                             "prepaid_duration": 240,
                             "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
@@ -2563,6 +2645,13 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
                             "carry_over_duration": 240,
                             "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
@@ -2575,8 +2664,14 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
                             "service_end": "20:00:00"
                         }
                     ]
@@ -2607,6 +2702,12 @@
                         },
                         {
                             "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
                             "prepaid_duration": 240,
                             "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
@@ -2627,6 +2728,13 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
                             "carry_over_duration": 240,
                             "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
@@ -2639,8 +2747,14 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
                             "service_end": "20:00:00"
                         }
                     ]
@@ -2671,6 +2785,12 @@
                         },
                         {
                             "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
                             "prepaid_duration": 240,
                             "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
@@ -2691,6 +2811,13 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
                             "carry_over_duration": 240,
                             "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
@@ -2703,8 +2830,14 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
                             "service_end": "20:00:00"
                         }
                     ]