Better modularization of Updater.