Moved common waypoint fields to map object