Refactoring: Updater (core & work)