Better model changes handling