Improved update manager