Added source and destination fields to Waypoint class.
Enabled Waypoint label.