Add status_fields in output model