Waypoint resolver