Added calls to ensure the model is updated