Added common waypoint fields to map object