Add new fields, fix response_code