Improved changes handling.