Added DataHandler and Waypoint