Improved handling of updates