Make Shuttles API work according to docs