Improve model change save