Improve validation
Update the model when the view have changed