Updated field names to match API