Added the waypoint manager