Updated field names