Extended waypoint database