Moved more waypoint properties to map object