Improve change handling