More Features for the WayPointManager