Updated TripService