Added full pickup and dropoff support