Update the way fields are passed in model.