diff --git a/library/include/mobilisis/tariff_customer.h b/library/include/mobilisis/tariff_customer.h
index b643ed5..da8d484 100644
--- a/library/include/mobilisis/tariff_customer.h
+++ b/library/include/mobilisis/tariff_customer.h
@@ -1,15 +1,14 @@
-#ifndef TARIFF_CUSTOMER_TYPE_H_INCLUDED
-#define TARIFF_CUSTOMER_TYPE_H_INCLUDED
+#ifndef TARIFF_CUSTOMER_H_INCLUDED
+#define TARIFF_CUSTOMER_H_INCLUDED
 
 #include <QString>
 
-struct CustomerType {
-    //enum class Customer;
+struct Customer {
+    enum class CustomerType {ADULT=0, CHILD, TEEN};
 
+    Customer() = default;
 
-    CustomerType() = default;
-
-    int cust_type;            // 1: Adult, 2: Child:
+    CustomerType cust_type;
     QString cust_label;
 };
 
diff --git a/library/include/mobilisis/tariff_daily_ticket.h b/library/include/mobilisis/tariff_daily_ticket.h
index 9dd9798..70c8e60 100644
--- a/library/include/mobilisis/tariff_daily_ticket.h
+++ b/library/include/mobilisis/tariff_daily_ticket.h
@@ -12,19 +12,19 @@ struct DailyTicket {
     int daily_ticket_unit_id;
     double daily_ticket_price;
 
-    int daily_ticket_tbase_id;              // time base setting for ticket:
-                                            // 1: absolute: using time stamps
-                                            // 2: relative: use offsets from
-                                            //    some reference time point,
-                                            //    typically "start time".
+    int daily_ticket_tbase_id;                  // time base setting for ticket:
+                                                // 1: absolute: using time stamps
+                                                // 2: relative: use offsets from
+                                                //    some reference time point,
+                                                //    typically "start time".
 
-    QVector<int> daily_ticket_clearance_id; // who is allowed to buy the ticket:
-                                            // list of user ids
+    QVector<int> daily_ticket_clearance_type;   // who is allowed to buy the ticket:
+                                                // list of customer types
 
-    QTime daily_ticket_from_min;            // used in case time base == 1
+    QTime daily_ticket_from_min;                // used in case time base == 1
     QTime daily_ticket_to_max;
 
-    int daily_ticket_from_offset_min;       // used in case time base == 2
+    int daily_ticket_from_offset_min;           // used in case time base == 2
     int daily_ticket_to_offset_max;
 };
 
diff --git a/library/include/mobilisis/tariff_timebase.h b/library/include/mobilisis/tariff_timebase.h
new file mode 100644
index 0000000..df737fe
--- /dev/null
+++ b/library/include/mobilisis/tariff_timebase.h
@@ -0,0 +1,14 @@
+#ifndef TARIFF_TIME_BASE_H_INCLUDED
+#define TARIFF_TIME_BASE_H_INCLUDED
+
+#include <QString>
+
+struct TimeBase {
+    enum class TimeBaseType {ABSOLUTE=0, RELATIVE=1};
+
+    TimeBase() = default;
+    TimeBaseType tbase_type;
+    QString tbase_label;
+};
+
+#endif // TARIFF_TIME_BASE_H_INCLUDED