diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json
index 0f137e4..679ec4f 100644
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -40,6 +40,16 @@
     {
       "time_range_id": 1,
       "time_range_from": "18:00:00",
+      "time_range_to": "08:00:00"
+    },
+    {
+      "time_range_id": 2,
+      "time_range_from": "16:00:00",
+      "time_range_to": "18:00:00"
+    },
+    {
+      "time_range_id": 3,
+      "time_range_from": "08:00:00",
       "time_range_to": "09:00:00"
     }
   ],
@@ -48,34 +58,40 @@
       "pop_id": 1049,
       "pop_label": "Zone 2",
       "pop_payment_method_id": 4,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
+      "pop_day_start_time": "08:00:00",
+      "pop_day_end_time": "18:00:00",
       "pop_price_night": 0,
       "pop_min_time": 20,
       "pop_max_time": 60,
       "pop_max_price": 80,
       "pop_min_price": 0,
       "pop_carry_over": 0,
+      "pop_carry_over_end_time_range": 3,
+      "comment_1": "Mon-Sat can be target of a carry-over",
       "pop_daily_card_price": 0,
-      "pop_business_hours": 7936,
-      "comment_business_hours": "Mon-Fri: 0x0000000001111100"
+      "pop_business_hours": 16128,
+      "comment_business_hours": "Mon-Sat: 0x0000000000003F00"
     },
     {
       "pop_id": 1050,
       "pop_label": "Zone 2",
       "pop_payment_method_id": 4,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
+      "pop_day_start_time": "08:00:00",
+      "pop_day_end_time": "18:00:00",
       "pop_price_night": 0,
       "pop_min_time": 20,
       "pop_max_time": 180,
       "pop_max_price": 320,
       "pop_min_price": 0,
       "pop_carry_over": 1,
-      "pop_carry_over_time_range_id": 1,
+      "pop_carry_over_time_range": 1,
+      "pop_carry_over_start_time_range": 2,
+      "comment_1": "Sun+Holiday can initiate a carry-over",
+      "pop_carry_over_end_time_range": 3,
+      "comment_2": "Sun+Holiday can be target of a carry-over",
       "pop_daily_card_price": 0,
       "pop_business_hours": 49152,
-      "comment_business_hours": "Sun+Holiday: 0x0000000110000000"
+      "comment_business_hours": "Sun+Holiday: 0x000000000000C000"
     }
   ],
   "PaymentRate": [
@@ -361,5 +377,77 @@
       "ped_payment_option_id": 1050,
       "ped_year": 0
     }
+  ],
+  "SpecialDaysWorktime": [
+    {
+      "pedwt_id": 1,
+      "pedwt_period_exc_day_id": 1,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "18:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2,
+      "pedwt_period_exc_day_id": 2,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "18:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 3,
+      "pedwt_period_exc_day_id": 3,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "18:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 4,
+      "pedwt_period_exc_day_id": 4,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "18:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 5,
+      "pedwt_period_exc_day_id": 5,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "18:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 6,
+      "pedwt_period_exc_day_id": 6,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "18:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 7,
+      "pedwt_period_exc_day_id": 7,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "18:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 8,
+      "pedwt_period_exc_day_id": 8,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "18:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 9,
+      "pedwt_period_exc_day_id": 9,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "18:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 10,
+      "pedwt_period_exc_day_id": 10,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "18:00:00",
+      "pedwt_price": 0
+    }
   ]
 }