Added Waypoints and search functionality