diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json
index 660cd6a..fb1f840 100644
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -29,17 +29,178 @@
       "pme_label": "steps"
     }
   ],
+  "TimeBase": [
+    {
+      "tbase_id": 0,
+      "tbase_type": 0,
+      "tbase_type_comment": "time is given as starting from some wall-clock-time",
+      "tbase_label": "absolute time"
+    },
+    {
+      "tbase_id": 1,
+      "tbase_type": 1,
+      "tbase_type_comment": "time is given as starting from 0 minutes",
+      "tbase_label": "relative time"
+    }
+  ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 2,
+      "time_range_from": 0,
+      "time_range_to": 5,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 2,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 2,
+      "time_range_from": 5,
+      "time_range_to": 10,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 3,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 2,
+      "time_range_from": 10,
+      "time_range_to": 15,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 4,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 2,
+      "time_range_from": 15,
+      "time_range_to": 20,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 5,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 2,
+      "time_range_from": 20,
+      "time_range_to": 25,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 6,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 2,
+      "time_range_from": 25,
+      "time_range_to": 30,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 7,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 30,
+      "time_range_to": 35,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 8,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 35,
+      "time_range_to": 40,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 9,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 40,
+      "time_range_to": 45,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 10,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 45,
+      "time_range_to": 50,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 11,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 50,
+      "time_range_to": 55,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 12,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 55,
+      "time_range_to": 60,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 13,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 60,
+      "time_range_to": 65,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 14,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 65,
+      "time_range_to": 70,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 15,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 70,
+      "time_range_to": 75,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 16,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 75,
+      "time_range_to": 80,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 17,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 80,
+      "time_range_to": 85,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 18,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 85,
+      "time_range_to": 90,
+      "time_range_comment": "[from, to[ in minutes"
+    }
+  ],
   "PaymentOption": [
     {
       "pop_id": 1049,
       "pop_label": "Zone 1",
-      "pop_payment_method_id": 3,
+      "pop_payment_method_id": 1,
       "pop_day_end_time": "00:00:00",
       "pop_day_night_end_time": "00:00:00",
       "pop_price_night": 0,
       "pop_min_time": 30,
       "pop_max_time": 90,
       "pop_min_price": 30,
+      "pop_max_price": 150,
       "pop_carry_over": 0,
       "pop_daily_card_price": 0
     }
@@ -49,6 +210,11 @@
       "pra_payment_option_id": 1049,
       "pra_payment_unit_id": 1,
       "pra_price": 10
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 2,
+      "pra_price": 5
     }
   ],
   "Duration": [
@@ -146,5 +312,15 @@
       "pwd_time_from": "08:00:00",
       "pwd_time_to": "12:00:00"
     }
+  ],
+  "PeriodYear": [
+    {
+      "pye_id": 8,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    }
   ]
 }