[c1987] Improve Waypoint Management