Added waypoint and route parsing.