Added Waypoints 2.0.2