Improvements to update manager