Added classes for waypoints and VOR waypoints.