Beautified UpdateManager.
Merged master.