Updated token field names.