diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json
index 1ece8cc..fc288e1 100755
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,13 +1,13 @@
 {	     
 "title":"DC2C_cash  ",
-"project":"Korneuburg",
-"version":"15.10.2023 14:55 02.00.06",
-"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1],
-"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3],
-"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
+"Project":"SV Bad Neuenahr",
+"Version":"6.7.1-2024-07-24",
+"CoinDenom(15..0)":[0,0,0,0,0,0,0,0,0,255,200,100,50,20,10,5],
+"CoinValue(15..0)":[0,0,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
+"CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0],
 "ExchangeRate":1,
 "TokenChannel":6,
-"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,5000,2000,1000,500],
 "BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
 "LocalTaxRate":19,
 "ForeignTaxRate":0,
@@ -15,5 +15,3 @@
 "Discount":0
 }
 
-#
-#
diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json
index 8f1174e..342582b 100755
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -1,14 +1,14 @@
 {
 "title":"DC2C_device",
-"project":"Korneuburg",
-"Version":"04.12.2023 00103",
+"Project":"SV Bad Neuenahr",
+"Version":"6.7.2-2024-07-24",
 "printer":1,
-"coinChk":1,
+"coinChk":3,
 "mifRd":1,
-"solarPwr":0,
+"solarPwr":1,
 "modem":1,
 "creditCard":1,
-"escrow":1,
+"escrow":0,
 "RejMotor":0,
 "shutter":1,
 "billRd":0,
@@ -23,8 +23,13 @@
 "BattWarn":11800,
 "BattErr":11200,
 "foreign":1,
-"refPrint":0
+"refundPrint":1,
+"billWarnLev":300,
+"billFullLev":380,
+"housing":3,
+"changeCoins":1,
+"dev_aux1":0,
+"dev_aux2":0,
+"dev_aux3":0,
+"dev_aux4":0
 }
-#
-#
-#
diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json
index 75a5c32..094239c 100755
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -1,24 +1,28 @@
 {
 "title":"DC2C_pri01",
-"project":"Korneuburg",
-"Version":"15.11.2023 00001",
+"Project":"SV Bad Neuenahr",
+"Version":"6.7.1-2024-07-24",
 "styl":"font 10",
 "styl":"size 11",
 "styl":"align c",
-"feed":"margin02",
-"feed":"rim02",
-"text":"Korneuburg",
-"feed":"nl"
-"feed":"nl"
-"text":"Parkschein",
-"feed":"nl",
-"feed":"nl",
+"text":"PARKTICKET",
 "styl":"size 00",
+"feed":"nl",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"nl",
 "styl":"align l",
+"text":"Ihr Kennzeichen: ",
+"feed":"nl",
 "styl":"size 11",
 "vari":"Dynamic01",
 "styl":"size 00",
-"text":"Parkzeit bezahlt bis: ",
+"feed":"nl",
+"text":"Parkende: ",
 "feed":"nl",
 "styl":"size 11",
 "vari":"Dynamic04",
@@ -26,7 +30,8 @@
 "styl":"size 00",
 "feed":"nl"
 }
-#
+#"feed":"margin02",
+#"feed":"rim02",
 
 
 
@@ -39,5 +44,3 @@
 
 
 
-#
-#
diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json
index 0a650c9..f3142a7 100755
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -1,16 +1,30 @@
-{
+{
 "title":"DC2C_pri02",
-"project":"Korneuburg",
-"Version":"15.11.2023 00001",
-"issued":"13.11.2023 01.01",
+"Project":"SV Bad Neuenahr",
+"Version":"6.7.1-2024-07-24",
+"text":"Standort: ",
+"feed":"nl",
+"vari":"location",
 "feed":"nl",
 "text":"Bezahlt: ",
 "styl":"size 11",
 "vari":"Dynamic07",
-"text":"",
 "feed":"nl",
-"styl":"size 00"
-}
-#
-#
-#
+"styl":"size 00",
+"text":"Gedruckt am: ",
+"vari":"wday deu short",
+"vari":"date ge",	
+"vari":"time long"
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json
index f30d9a4..9db4909 100755
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -1,24 +1,38 @@
-{
+{
 "title":"DC2C_pri03",
-"project":"Korneuburg",
-"Version":"15.11.2023 00001",
+"Project":"SV Bad Neuenahr",
+"Version":"6.7.1-2024-07-24",
 "feed":"nl",
 "styl":"size 00",
-"text":"Standort: ",
-"feed":"nl",
-"vari":"location",
 "text":"Automat: ",
 "vari":"manu",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
 "feed":"nl",
+"text":"Ort: ",
+"vari":"location",	
 "styl":"align c",
-"text":"Bitte gut sichtbar",
+"text":"SV Bad Neuenahr",
 "feed":"nl",
-"text":"hinter die Scheibe",
+"text":"Ticket-Nr. ",
+"vari":"TickCtr",
 "feed":"nl",
-"text":"legen",
+"text":"Automatentechnik ",
 "feed":"nl",
+"text":"Baumann GmbH",
 "feed":"eject"
-}
-#
-#
-#
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json
index 60329d8..9e89667 100755
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@@ -1,8 +1,6 @@
 {
 "title":"DC2C_pri04",
-"project":"Korneuburg",
-"Version":"15.11.2023 01.01",
-"text":"";
-}#
-#
-#
+"Project":"SV Bad Neuenahr",
+"Version":"6.7.1-2024-07-24",
+"text":""
+}
diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json
index b9b7281..5ce8789 100755
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -1,24 +1,30 @@
 {
 "title":"DC2C_pri05",
-"project":"Korneuburg",
-"Version":"15.11.2023 00001",
+"Project":"SV Bad Neuenahr",
+"Version":"6.7.1-2024-07-24",
 "styl":"font 10",
 "styl":"size 11",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"Korneuburg",
-"feed":"nl"
-"feed":"nl"
-"text":"Parkschein",
-"feed":"nl",
-"feed":"nl",
+"text":"PARKTICKET",
 "styl":"size 00",
+"feed":"nl",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"nl",
 "styl":"align l",
+"text":"Ihr Kennzeichen: ",
+"feed":"nl",
 "styl":"size 11",
 "vari":"Dynamic01",
 "styl":"size 00",
-"text":"Parkzeit bezahlt bis: ",
+"feed":"nl",
+"text":"Parkende: ",
 "feed":"nl",
 "styl":"size 11",
 "vari":"Dynamic04",
@@ -38,6 +44,3 @@
 
 
 
-#
-#
-#
diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json
index 9302f75..a679b43 100755
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -1,15 +1,20 @@
 {
 "title":"DC2C_pri06",
-"project":"Korneuburg",
-"Version":"15.11.2023 00001",
-"issued":"13.11.2023 01.01",
+"Project":"SV Bad Neuenahr",
+"Version":"6.7.1-2024-07-24",
+"text":"Standort: ",
+"feed":"nl",
+"vari":"location",
 "feed":"nl",
 "text":"Bezahlt: ",
 "styl":"size 11",
 "vari":"Dynamic07",
-"text":"",
 "feed":"nl",
-"styl":"size 00"
+"styl":"size 00",
+"text":"Gedruckt am: ",
+"vari":"wday deu short",
+"vari":"date ge",	
+"vari":"time long"
 
 }
 
@@ -24,6 +29,3 @@
 
 
 
-#
-#
-#
diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json
index 9939fab..8bee26a 100755
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -1,22 +1,27 @@
 {
 "title":"DC2C_pri07",
-"project":"Korneuburg",
-"Version":"15.11.2023 00001",
+"Project":"SV Bad Neuenahr",
+"Version":"6.7.1-2024-07-24",
 "feed":"nl",
 "styl":"size 00",
-"text":"Standort: ",
-"feed":"nl",
-"vari":"location",
 "text":"Automat: ",
 "vari":"manu",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
 "feed":"nl",
+"text":"Ort: ",
+"vari":"location",	
 "styl":"align c",
-"text":"Bitte gut sichtbar",
+"text":"SV Bad Neuenahr",
 "feed":"nl",
-"text":"hinter die Scheibe",
+"text":"Ticket-Nr. ",
+"vari":"TickCtr",
 "feed":"nl",
-"text":"legen",
+"text":"Automatentechnik ",
 "feed":"nl",
+"text":"Baumann GmbH",
 "feed":"eject"
 }
 
@@ -31,6 +36,3 @@
 
 
 
-#
-#
-#
diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json
index 9dfb910..bf27c2e 100755
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -1,8 +1,6 @@
 {
 "title":"DC2C_pri08",
-"project":"Korneuburg",
-"Version":"15.11.2023 01.01",
-"text":"";
-}#
-#
-#
+"Project":"SV Bad Neuenahr",
+"Version":"6.7.1-2024-07-24",
+"text":""
+}
diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json
index bfe8a0f..78ed4e1 100755
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri31",
-"project":"door close print",
-"Version":"15.11.2023 00001",
+"Project":"door close print",
+"Version":"6.7.1-2024-07-24",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
@@ -15,10 +15,26 @@
 "vari":"date ge",
 "vari":"time long",
 "feed":"nl",
+"text":"KuNu: ",
+"vari":"cunu",	
+"text":"MaNu: ",
+"vari":"manu",	
+"text":"Ort: ",
+"vari":"location",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"text":"Name: ",
+"vari":"alias",	
+"feed":"nl",
+"text":"**Automatentechnik ",
+"feed":"nl",
+"text":"   Baumann GmbH ***",
+"feed":"nl",
+"text":" * * * * * * * * * ",
+"feed":"nl",
 "feed":"eject"
 }
 
 
-#
-#
-#
diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json
index 34969cb..1b9d607 100755
--- a/etc/psa_config/DC2C_print32.json
+++ b/etc/psa_config/DC2C_print32.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri32",
-"project":"refund reciept",
-"Version":"15.11.2023 00001",
+"Project":"refund reciept",
+"Version":"6.7.1-2024-07-24",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
@@ -40,6 +40,3 @@
 }
 
 
-#
-#
-#
diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json
index 0f6d218..ff79533 100644
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,6 +1,6 @@
 {
   "Project" :   "SV Bad Neuenahr",
-  "Version" :   "1.0.0",
+  "Version" :   "1.0.1",
   "Info"    :   "Standard",
   "comment_1": 	"20mins free (broetchentaste)",
   "comment_2": 	"every following 20mins: 0,40 euro",
@@ -32,6 +32,33 @@
       "pme_label": "steps"
     }
   ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_from": "18:00:00",
+      "time_range_to": "08:00:00"
+    },
+    {
+      "time_range_id": 2,
+      "time_range_from": "08:00:00",
+      "time_range_to": "18:00:00"
+    },
+    {
+      "time_range_id": 3,
+      "time_range_from": "08:00:00",
+      "time_range_to": "18:00:00"
+    },
+    {
+      "time_range_id": 4,
+      "time_range_from": "00:00:00",
+      "time_range_to": "08:00:00"
+    },
+    {
+      "time_range_id": 5,
+      "time_range_from": "18:00:00",
+      "time_range_to": "23:59:00"
+    }
+  ],
   "PaymentOption": [
     {
       "pop_id": 1049,
@@ -45,8 +72,15 @@
       "pop_max_price": 500,
       "pop_min_price": 0,
       "pop_carry_over": 1,
+      "pop_carry_over_time_range": 1,
+      "pop_carry_over_start_time_range": 2,
+      "pop_carry_over_end_time_range": 3,
+      "pop_prepay": 1,
+      "pop_prepay_start_time_range": 4,
+      "pop_prepay_end_time_range": 5,
       "pop_daily_card_price": 500,
-      "pop_business_hours": 128
+      "pop_business_hours": 163584,
+      "comment_1": "163584 = 0x27F00 = 10|0111|1111|0000|0000 -> all days with restricted hours"
     }
   ],
   "PaymentRate": [
diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json
index 679ec4f..ea763c8 100644
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -1,6 +1,6 @@
 {
   "Project" :   "SV Bad Neuenahr",
-  "Version" :   "1.0.0",
+  "Version" :   "1.0.1",
   "Info"    :   "Shorttime-tariff-1",
   "comment_1": 	"20mins free (broetchentaste)",
   "comment_2": 	"every following 20mins: 0,40 euro",
diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json
index c94e79e..5405d1e 100644
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -1,6 +1,6 @@
 {
   "Project" :   "SV Bad Neuenahr",
-  "Version" :   "1.0.0+2024-04-29T15:41:38",
+  "Version" :   "1.0.1+2024-04-29T15:41:38",
   "Info"    :   "Kurzzeit 2",
   "comment_1": 	"20mins free (broetchentaste)",
   "comment_2": 	"every following 20mins: 0,40 euro",
diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json
index cc4fc9c..0152251 100644
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
@@ -1,6 +1,6 @@
 {
   "Project" :   "SV Bad Neuenahr",
-  "Version" :   "1.0.0+2024-04-29T15:41:38",
+  "Version" :   "1.0.1+2024-04-29T15:41:38",
   "Info"    :   "Kurzzeit 3",
   "comment_1": 	"20mins free (broetchentaste)",
   "comment_2": 	"every following 20mins: 0,40 euro",
diff --git a/etc/psa_tariff/tariff05.json b/etc/psa_tariff/tariff05.json
index d96d2ed..4d804a9 100644
--- a/etc/psa_tariff/tariff05.json
+++ b/etc/psa_tariff/tariff05.json
@@ -1,6 +1,6 @@
 {
   "Project" :   "SV Bad Neuenahr",
-  "Version" :   "1.0.0+2024-04-29T16:15:20",
+  "Version" :   "1.0.1+2024-04-29T16:15:20",
   "Info"    :   "Langzeitparktarif",
   "comment_1": 	"20mins free (broetchentaste)",
   "comment_2": 	"every following 20mins: 0,40 euro",
@@ -34,6 +34,23 @@
       "pme_label": "steps"
     }
   ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_from": "18:00:00",
+      "time_range_to": "08:00:00"
+    },
+    {
+      "time_range_id": 2,
+      "time_range_from": "08:00:00",
+      "time_range_to": "18:00:00"
+    },
+    {
+      "time_range_id": 3,
+      "time_range_from": "08:00:00",
+      "time_range_to": "18:00:00"
+    }
+  ],
   "PaymentOption": [
     {
       "pop_id": 1049,
@@ -45,7 +62,11 @@
       "pop_min_time": 20,
       "pop_max_time": 10080,
       "pop_min_price": 0,
-      "pop_carry_over": 0,
+      "pop_max_price": 2500,
+      "pop_carry_over": 1,
+      "pop_carry_over_time_range": 1,
+      "pop_carry_over_start_time_range": 2,
+      "pop_carry_over_end_time_range": 3,
       "pop_daily_card_price": 500,
       "pop_business_hours": 163584,
       "comment_1": "163584 = 0x27F00 = 10|0111|1111|0000|0000 -> all days with restricted hours"
diff --git a/etc/psa_tariff/tariff06.json b/etc/psa_tariff/tariff06.json
index 54c64cb..83af49e 100644
--- a/etc/psa_tariff/tariff06.json
+++ b/etc/psa_tariff/tariff06.json
@@ -1,7 +1,7 @@
 {
   "Project" :   "SV Bad Neuenahr",
-  "Version" :   "1.0.0",
-  "Info"    :   "Standard-Tarif",
+  "Version" :   "1.0.1",
+  "Info"    :   "Sondertarif 24h-Ticket-Wohnmobile",
   "Currency": [
     {
       "pcu_id": 2,
@@ -33,44 +33,52 @@
     {
       "pop_id": 1049,
       "pop_label": "Zone 1",
-      "pop_payment_method_id": 3,
+      "pop_payment_method_id": 4,
       "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": 180,
-      "pop_min_price": 60,
-      "pop_carry_over": 1,
-      "pop_daily_card_price": 0
+      "pop_min_time": 1440,
+      "pop_max_time": 1440,
+      "pop_min_price": 800,
+      "pop_max_price": 800,
+      "pop_carry_over": 0,
+      "pop_daily_card_price": 0,
+      "pop_business_hours": 16128,
+      "comment_1": "16128 = 0x3F00 = 0111|1111|0000|0000 -> all days with no restricted hours"
     }
   ],
   "PaymentRate": [
     {
       "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": 120
+      "pra_price": 800
     }
   ],
   "Duration": [
     {
       "pun_id": 1,
-      "pun_label": "5 min",
-      "pun_duration": 5 
+      "pun_label": "24h",
+      "pun_duration": 1440 
+    }
+  ],
+  "Product" : [
+    {
+      "tariff_product_id": 9,
+      "tariff_product_price": 800,
+      "tariff_product_name": "TWENTY_FOUR_HOURS_TICKET",
+      "tariff_product_start": "00:00:00",
+      "tariff_product_end": "00:00:00",
+      "tariff_product_from_in_minutes_from_start": 0,
+      "tariff_product_to_in_minutes_from_start": 0
     },
     {
-      "pun_id": 3,
-      "pun_label": "15 min",
-      "pun_duration": 15
-    },
-    {
-      "pun_id": 4,
-      "pun_label": "1 min",
-      "pun_duration": 1
+      "tariff_product_id": 7,
+      "tariff_product_price": 0,
+      "tariff_product_name": "INVALID",
+      "tariff_product_start": "00:00:00",
+      "tariff_product_end": "00:00:00",
+      "tariff_product_from_in_minutes_from_start": 0,
+      "tariff_product_to_in_minutes_from_start": 0
     }
   ],
   "WeekDaysWorktime": [
@@ -78,587 +86,50 @@
       "pwd_id": 621,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 621,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
     },
     {
       "pwd_id": 622,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 622,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
     },
     {
       "pwd_id": 623,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 623,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
     },
     {
       "pwd_id": 624,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
     },
     {
       "pwd_id": 625,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
     },
     {
       "pwd_id": 626,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 6,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    }
-  ],
-  "SpecialDaysWorktime": [
-    {
-      "pedwt_id": 2156,
-      "pedwt_period_exc_day_id": 2024,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
     },
     {
-      "pedwt_id": 2158,
-      "pedwt_period_exc_day_id": 2025,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2160,
-      "pedwt_period_exc_day_id": 2026,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2162,
-      "pedwt_period_exc_day_id": 2027,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2164,
-      "pedwt_period_exc_day_id": 2028,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2170,
-      "pedwt_period_exc_day_id": 2030,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2172,
-      "pedwt_period_exc_day_id": 2032,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2174,
-      "pedwt_period_exc_day_id": 11,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2175,
-      "pedwt_period_exc_day_id": 13,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2177,
-      "pedwt_period_exc_day_id": 2023,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2178,
-      "pedwt_period_exc_day_id": 2022,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2179,
-      "pedwt_period_exc_day_id": 14,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2184,
-      "pedwt_period_exc_day_id": 2021,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2188,
-      "pedwt_period_exc_day_id": 2031,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2189,
-      "pedwt_period_exc_day_id": 2029,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2194,
-      "pedwt_period_exc_day_id": 2034,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2200,
-      "pedwt_period_exc_day_id": 2037,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2201,
-      "pedwt_period_exc_day_id": 2039,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2202,
-      "pedwt_period_exc_day_id": 2038,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2226,
-      "pedwt_period_exc_day_id": 2016,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2245,
-      "pedwt_period_exc_day_id": 2035,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2246,
-      "pedwt_period_exc_day_id": 2036,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2249,
-      "pedwt_period_exc_day_id": 2050,
-      "pedwt_time_from": "08:00:00",
-      "pedwt_time_to": "16:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2250,
-      "pedwt_period_exc_day_id": 2051,
-      "pedwt_time_from": "08:00:00",
-      "pedwt_time_to": "16:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2251,
-      "pedwt_period_exc_day_id": 2052,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2252,
-      "pedwt_period_exc_day_id": 2053,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2253,
-      "pedwt_period_exc_day_id": 2054,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2254,
-      "pedwt_period_exc_day_id": 2055,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2255,
-      "pedwt_period_exc_day_id": 2056,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2256,
-      "pedwt_period_exc_day_id": 2057,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2257,
-      "pedwt_period_exc_day_id": 2058,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2258,
-      "pedwt_period_exc_day_id": 2059,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2259,
-      "pedwt_period_exc_day_id": 2060,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    }
-  ],
-  "SpecialDays": [
-    {
-      "ped_id": 11,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2023-12-08",
-      "ped_date_end": "2023-12-08",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 13,
-      "ped_label": "Christtag",
-      "ped_date_start": "2023-12-25",
-      "ped_date_end": "2023-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 14,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2023-12-26",
-      "ped_date_end": "2023-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2016,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2024-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2021,
-      "ped_label": "Heilig Drei Koenige",
-      "ped_date_start": "2024-01-06",
-      "ped_date_end": "2024-01-06",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2022,
-      "ped_label": "Ostermontag",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2023,
-      "ped_label": "Ostersonntag",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2024,
-      "ped_label": "Staatsfeiertag",
-      "ped_date_start": "2024-05-01",
-      "ped_date_end": "2024-05-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2025,
-      "ped_label": "Christi Himmelfahrt",
-      "ped_date_start": "2024-05-09",
-      "ped_date_end": "2024-05-09",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2026,
-      "ped_label": "Pfingst Montag",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2027,
-      "ped_label": "Fronleichnam",
-      "ped_date_start": "2024-05-30",
-      "ped_date_end": "2024-05-30",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2028,
-      "ped_label": "Maria Himmelfahrt",
-      "ped_date_start": "2024-08-15",
-      "ped_date_end": "2024-08-15",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2029,
-      "ped_label": "Nationalfeiertag",
-      "ped_date_start": "2024-10-26",
-      "ped_date_end": "2024-10-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2030,
-      "ped_label": "Allerheiligen",
-      "ped_date_start": "2024-11-01",
-      "ped_date_end": "2024-11-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2031,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2024-08-12",
-      "ped_date_end": "2024-08-12",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2032,
-      "ped_label": "Christtag",
-      "ped_date_start": "2024-12-25",
-      "ped_date_end": "2024-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2034,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2024-12-26",
-      "ped_date_end": "2024-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2035,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2025-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0 
-    },
-    {
-      "ped_id": 2036,
-      "ped_label": "Heilig Drei Koenige",
-      "ped_date_start": "2025-06-01",
-      "ped_date_end": "2025-06-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2037,
-      "ped_label": "Ostermontag",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2039,
-      "ped_label": "Ostersonntag",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2038,
-      "ped_label": "Staatsfeiertag",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2050,
-      "ped_label": "Christi Himmelfahrt",
-      "ped_date_start": "2025-05-29",
-      "ped_date_end": "2025-05-29",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2051,
-      "ped_label": "Pfingstmontag",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2052,
-      "ped_label": "Fronlaeichnam",
-      "ped_date_start": "2025-06-19",
-      "ped_date_end": "2025-06-19",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2053,
-      "ped_label": "Mariae Himmelfahrt",
-      "ped_date_start": "2025-08-15",
-      "ped_date_end": "2025-08-15",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2054,
-      "ped_label": "Nationalfeiertag",
-      "ped_date_start": "2025-10-26",
-      "ped_date_end": "2025-10-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2055,
-      "ped_label": "Allerheiligen",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2025-12-08",
-      "ped_date_end": "2025-12-08",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2057,
-      "ped_label": "Christtag",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2058,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2059,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2026-01-01",
-      "ped_date_end": "2026-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Heilige Drei Koenige",
-      "ped_date_start": "2026-01-06",
-      "ped_date_end": "2026-01-06",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    }
-  ],
-  "PeriodYear": [
-    {
-      "pye_id": 8,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 7,
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
     }
   ]
 }
diff --git a/etc/psa_tariff/tariff07.json b/etc/psa_tariff/tariff07.json
index 1dad661..c12fe29 100644
--- a/etc/psa_tariff/tariff07.json
+++ b/etc/psa_tariff/tariff07.json
@@ -1,6 +1,6 @@
 {
   "Project" :   "SV Bad Neuenahr",
-  "Version" :   "1.0.0",
+  "Version" :   "1.0.1",
   "Info"    :   "Wochenend-Tarif",
   "Currency": [
     {
@@ -29,48 +29,227 @@
       "pme_label": "steps"
     }
   ],
+  "TimeRange" : [
+    {
+      "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": "18:00:00"
+    }
+  ],
   "PaymentOption": [
     {
       "pop_id": 1049,
       "pop_label": "Zone 1",
-      "pop_payment_method_id": 3,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "16:00:00",
+      "pop_day_night_end_time": "18:00:00",
       "pop_price_night": 0,
-      "pop_min_time": 30,
-      "pop_max_time": 180,
-      "pop_min_price": 60,
+      "pop_min_time": 20,
+      "pop_max_time": 1440,
+      "pop_min_date_time": "-w0dFriT16:00:00",
+      "pop_max_date_time": "+w0dMonT00:00:00",
+      "pop_min_price": 0,
+      "pop_max_price": 200,
       "pop_carry_over": 1,
-      "pop_daily_card_price": 0
+      "pop_carry_over_time_range": 1,
+      "pop_carry_over_start_time_range": 2,
+      "comment_1": "Fri can initiate a carry-over",
+      "pop_carry_over_end_time_range": 3,
+      "comment_2": "Sat can be target of a carry-over",
+      "pop_daily_card_price": 0,
+      "pop_business_hours": 135168,
+      "comment_1": "135168 = 0x21000 = 10|0001|0000|0000|0000 -> Fri with restricted hours"
+    },
+    {
+      "pop_id": 1050,
+      "pop_label": "Zone 2",
+      "pop_payment_method_id": 4,
+      "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": 1440,
+      "pop_max_price": 500,
+      "pop_min_price": 0,
+      "pop_carry_over": 1,
+      "pop_carry_over_time_range": 1,
+      "pop_carry_over_start_time_range": 2,
+      "comment_1": "Sat can initiate a carry-over",
+      "pop_carry_over_end_time_range": 3,
+      "comment_2": "Sun can be target of a carry-over",
+      "pop_daily_card_price": 500,
+      "pop_business_hours": 139264,
+      "comment_1": "139264 = 0x22000 = 10|0010|0000|0000|0000 -> Sat with restricted hours"
+    },
+    {
+      "pop_id": 1051,
+      "pop_label": "Zone 2",
+      "pop_payment_method_id": 4,
+      "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": 1440,
+      "pop_max_price": 500,
+      "pop_min_price": 0,
+      "pop_carry_over": 0,
+      "pop_daily_card_price": 500,
+      "pop_business_hours": 147456,
+      "comment_1": "147456 = 0x24000 = 10|0100|0000|0000|0000 -> Sun with restricted hours"
     }
   ],
   "PaymentRate": [
     {
       "pra_payment_option_id": 1049,
       "pra_payment_unit_id": 1,
-      "pra_price": 10
+      "pra_price": 0
     },
     {
       "pra_payment_option_id": 1049,
       "pra_payment_unit_id": 2,
+      "pra_price": 40
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 3,
+      "pra_price": 80
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 4,
       "pra_price": 120
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 5,
+      "pra_price": 160
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 6,
+      "pra_price": 200
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 7,
+      "pra_price": 240
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 8,
+      "pra_price": 280
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 9,
+      "pra_price": 320
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 10,
+      "pra_price": 360
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 11,
+      "pra_price": 400
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 12,
+      "pra_price": 440
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 13,
+      "pra_price": 480
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 14,
+      "pra_price": 500
     }
   ],
   "Duration": [
     {
       "pun_id": 1,
-      "pun_label": "5 min",
-      "pun_duration": 5 
+      "pun_label": "20 min",
+      "pun_duration": 20
+    },
+    {
+      "pun_id": 2,
+      "pun_label": "40 min",
+      "pun_duration": 40
     },
     {
       "pun_id": 3,
-      "pun_label": "15 min",
-      "pun_duration": 15
+      "pun_label": "60 min",
+      "pun_duration": 60
     },
     {
       "pun_id": 4,
-      "pun_label": "1 min",
-      "pun_duration": 1
+      "pun_label": "80 min",
+      "pun_duration": 80
+    },
+    {
+      "pun_id": 5,
+      "pun_label": "100 min",
+      "pun_duration": 100
+    },
+    {
+      "pun_id": 6,
+      "pun_label": "120 min",
+      "pun_duration": 120
+    },
+    {
+      "pun_id": 7,
+      "pun_label": "140 min",
+      "pun_duration": 140
+    },
+    {
+      "pun_id": 8,
+      "pun_label": "160 min",
+      "pun_duration": 160
+    },
+    {
+      "pun_id": 9,
+      "pun_label": "180 min",
+      "pun_duration": 180
+    },
+    {
+      "pun_id": 10,
+      "pun_label": "200 min",
+      "pun_duration": 200
+    },
+    {
+      "pun_id": 11,
+      "pun_label": "220 min",
+      "pun_duration": 220
+    },
+    {
+      "pun_id": 12,
+      "pun_label": "240 min",
+      "pun_duration": 240
+    },
+    {
+      "pun_id": 13,
+      "pun_label": "260 min",
+      "pun_duration": 260
+    },
+    {
+      "pun_id": 14,
+      "pun_label": "24h",
+      "pun_duration": 1440
     }
   ],
   "WeekDaysWorktime": [
@@ -78,587 +257,50 @@
       "pwd_id": 621,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "00:00:00"
     },
     {
       "pwd_id": 621,
       "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "00:00:00"
     },
     {
       "pwd_id": 622,
       "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "00:00:00"
     },
     {
       "pwd_id": 622,
       "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "00:00:00"
     },
     {
       "pwd_id": 623,
       "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "16:00:00",
+      "pwd_time_to": "18:00:00"
     },
     {
       "pwd_id": 623,
       "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 6,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    }
-  ],
-  "SpecialDaysWorktime": [
-    {
-      "pedwt_id": 2156,
-      "pedwt_period_exc_day_id": 2024,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
+      "pwd_time_to": "18:00:00"
     },
     {
-      "pedwt_id": 2158,
-      "pedwt_period_exc_day_id": 2025,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2160,
-      "pedwt_period_exc_day_id": 2026,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2162,
-      "pedwt_period_exc_day_id": 2027,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2164,
-      "pedwt_period_exc_day_id": 2028,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2170,
-      "pedwt_period_exc_day_id": 2030,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2172,
-      "pedwt_period_exc_day_id": 2032,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2174,
-      "pedwt_period_exc_day_id": 11,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2175,
-      "pedwt_period_exc_day_id": 13,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2177,
-      "pedwt_period_exc_day_id": 2023,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2178,
-      "pedwt_period_exc_day_id": 2022,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2179,
-      "pedwt_period_exc_day_id": 14,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2184,
-      "pedwt_period_exc_day_id": 2021,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2188,
-      "pedwt_period_exc_day_id": 2031,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2189,
-      "pedwt_period_exc_day_id": 2029,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2194,
-      "pedwt_period_exc_day_id": 2034,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2200,
-      "pedwt_period_exc_day_id": 2037,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2201,
-      "pedwt_period_exc_day_id": 2039,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2202,
-      "pedwt_period_exc_day_id": 2038,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2226,
-      "pedwt_period_exc_day_id": 2016,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2245,
-      "pedwt_period_exc_day_id": 2035,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2246,
-      "pedwt_period_exc_day_id": 2036,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2249,
-      "pedwt_period_exc_day_id": 2050,
-      "pedwt_time_from": "08:00:00",
-      "pedwt_time_to": "16:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2250,
-      "pedwt_period_exc_day_id": 2051,
-      "pedwt_time_from": "08:00:00",
-      "pedwt_time_to": "16:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2251,
-      "pedwt_period_exc_day_id": 2052,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2252,
-      "pedwt_period_exc_day_id": 2053,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2253,
-      "pedwt_period_exc_day_id": 2054,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2254,
-      "pedwt_period_exc_day_id": 2055,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2255,
-      "pedwt_period_exc_day_id": 2056,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2256,
-      "pedwt_period_exc_day_id": 2057,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2257,
-      "pedwt_period_exc_day_id": 2058,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2258,
-      "pedwt_period_exc_day_id": 2059,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2259,
-      "pedwt_period_exc_day_id": 2060,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    }
-  ],
-  "SpecialDays": [
-    {
-      "ped_id": 11,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2023-12-08",
-      "ped_date_end": "2023-12-08",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 13,
-      "ped_label": "Christtag",
-      "ped_date_start": "2023-12-25",
-      "ped_date_end": "2023-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 14,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2023-12-26",
-      "ped_date_end": "2023-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2016,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2024-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2021,
-      "ped_label": "Heilig Drei Koenige",
-      "ped_date_start": "2024-01-06",
-      "ped_date_end": "2024-01-06",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2022,
-      "ped_label": "Ostermontag",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2023,
-      "ped_label": "Ostersonntag",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2024,
-      "ped_label": "Staatsfeiertag",
-      "ped_date_start": "2024-05-01",
-      "ped_date_end": "2024-05-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2025,
-      "ped_label": "Christi Himmelfahrt",
-      "ped_date_start": "2024-05-09",
-      "ped_date_end": "2024-05-09",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2026,
-      "ped_label": "Pfingst Montag",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2027,
-      "ped_label": "Fronleichnam",
-      "ped_date_start": "2024-05-30",
-      "ped_date_end": "2024-05-30",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2028,
-      "ped_label": "Maria Himmelfahrt",
-      "ped_date_start": "2024-08-15",
-      "ped_date_end": "2024-08-15",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2029,
-      "ped_label": "Nationalfeiertag",
-      "ped_date_start": "2024-10-26",
-      "ped_date_end": "2024-10-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2030,
-      "ped_label": "Allerheiligen",
-      "ped_date_start": "2024-11-01",
-      "ped_date_end": "2024-11-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2031,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2024-08-12",
-      "ped_date_end": "2024-08-12",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2032,
-      "ped_label": "Christtag",
-      "ped_date_start": "2024-12-25",
-      "ped_date_end": "2024-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2034,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2024-12-26",
-      "ped_date_end": "2024-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2035,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2025-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0 
-    },
-    {
-      "ped_id": 2036,
-      "ped_label": "Heilig Drei Koenige",
-      "ped_date_start": "2025-06-01",
-      "ped_date_end": "2025-06-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2037,
-      "ped_label": "Ostermontag",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2039,
-      "ped_label": "Ostersonntag",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2038,
-      "ped_label": "Staatsfeiertag",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2050,
-      "ped_label": "Christi Himmelfahrt",
-      "ped_date_start": "2025-05-29",
-      "ped_date_end": "2025-05-29",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2051,
-      "ped_label": "Pfingstmontag",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2052,
-      "ped_label": "Fronlaeichnam",
-      "ped_date_start": "2025-06-19",
-      "ped_date_end": "2025-06-19",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2053,
-      "ped_label": "Mariae Himmelfahrt",
-      "ped_date_start": "2025-08-15",
-      "ped_date_end": "2025-08-15",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2054,
-      "ped_label": "Nationalfeiertag",
-      "ped_date_start": "2025-10-26",
-      "ped_date_end": "2025-10-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2055,
-      "ped_label": "Allerheiligen",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2025-12-08",
-      "ped_date_end": "2025-12-08",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2057,
-      "ped_label": "Christtag",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2058,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2059,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2026-01-01",
-      "ped_date_end": "2026-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Heilige Drei Koenige",
-      "ped_date_start": "2026-01-06",
-      "ped_date_end": "2026-01-06",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    }
-  ],
-  "PeriodYear": [
-    {
-      "pye_id": 8,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 7,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
     }
   ]
 }