Improve update handling