diff --git a/amarillo/plugins/enhancer/configuration.py b/amarillo/plugins/enhancer/configuration.py
index 3b11418..e70fe99 100644
--- a/amarillo/plugins/enhancer/configuration.py
+++ b/amarillo/plugins/enhancer/configuration.py
@@ -14,7 +14,15 @@ from amarillo.configuration import configure_services
 
 logger = logging.getLogger(__name__)
 
+enhancer_configured = False
+
 def configure_enhancer_services():
+    #Make sure configuration only happens once
+    global enhancer_configured 
+    if enhancer_configured:
+        logger.info("Enhancer is already configured")
+        return
+
     configure_services()
 
     logger.info("Load stops...")
@@ -45,5 +53,5 @@ def configure_enhancer_services():
                 container['carpools'].delete(carpool.agency, carpool.id)
 
     logger.info("Restored carpools: %s", container['carpools'].get_all_ids())
-    logger.info("Starting scheduler")
-    gtfs_generator.start_schedule()
\ No newline at end of file
+
+    enhancer_configured = True
diff --git a/amarillo/plugins/enhancer/enhancer.py b/amarillo/plugins/enhancer/enhancer.py
index 30b44e6..d459585 100644
--- a/amarillo/plugins/enhancer/enhancer.py
+++ b/amarillo/plugins/enhancer/enhancer.py
@@ -70,7 +70,7 @@ def run_enhancer():
         logger.info("Goodbye Enhancer")
 
 def setup(app):
-    thread = Thread(target=run_enhancer)
+    thread = Thread(target=run_enhancer, daemon=True)
     thread.start()
 
 
diff --git a/amarillo/plugins/enhancer/services/trips.py b/amarillo/plugins/enhancer/services/trips.py
index 3a93c53..6faa749 100644
--- a/amarillo/plugins/enhancer/services/trips.py
+++ b/amarillo/plugins/enhancer/services/trips.py
@@ -1,5 +1,5 @@
 from amarillo.plugins.enhancer.models.gtfs import GtfsTimeDelta, GtfsStopTime
-from amarillo.models.Carpool import MAX_STOPS_PER_TRIP, Carpool, Weekday, StopTime, PickupDropoffType
+from amarillo.models.Carpool import MAX_STOPS_PER_TRIP, Carpool, Weekday, StopTime, PickupDropoffType, Driver, RidesharingInfo
 from amarillo.services.config import config
 from amarillo.plugins.enhancer.services.gtfs_constants import *
 from amarillo.plugins.enhancer.services.routing import RoutingService, RoutingException
@@ -17,8 +17,7 @@ logger = logging.getLogger(__name__)
 
 class Trip:
 
-    # TODO: add driver attributes, additional ridesharing info
-    def __init__(self, trip_id, route_name, headsign, url, calendar, departureTime, path, agency, lastUpdated, stop_times, bbox):
+    def __init__(self, trip_id, route_name, headsign, url, calendar, departureTime, path, agency, lastUpdated, stop_times, driver: Driver, additional_ridesharing_info: RidesharingInfo, bbox):
         if isinstance(calendar, set):
             self.runs_regularly = True
             self.weekdays = [ 
@@ -44,6 +43,8 @@ class Trip:
         self.stops = []
         self.lastUpdated = lastUpdated
         self.stop_times = stop_times
+        self.driver = driver
+        self.additional_ridesharing_info = additional_ridesharing_info
         self.bbox = bbox
         self.route_name = route_name
         self.trip_headsign = headsign
@@ -204,7 +205,7 @@ class TripTransformer:
     def __init__(self, stops_store):
         self.stops_store = stops_store
 
-    def transform_to_trip(self, carpool):
+    def transform_to_trip(self, carpool : Carpool):
         stop_times = self._convert_stop_times(carpool)
         route_name = carpool.stops[0].name + " nach " + carpool.stops[-1].name
         headsign= carpool.stops[-1].name
@@ -216,8 +217,7 @@ class TripTransformer:
             max([pt[0] for pt in path.coordinates]),
             max([pt[1] for pt in path.coordinates]))
             
-        # TODO: pass driver and ridesharing info object to the Trip constructor
-        trip = Trip(trip_id, route_name, headsign, str(carpool.deeplink), carpool.departureDate, carpool.departureTime, carpool.path, carpool.agency, carpool.lastUpdated, stop_times, bbox)
+        trip = Trip(trip_id, route_name, headsign, str(carpool.deeplink), carpool.departureDate, carpool.departureTime, carpool.path, carpool.agency, carpool.lastUpdated, stop_times, carpool.driver, carpool.additional_ridesharing_info, bbox)
 
         return trip