Update the model to use new properties