Added multiple classes and departure points.