Added classes for waypoints and VOR wapoints.