Make Shuttles work according to new docs