Added Shuttle and Canteen endpoints.