Refactor updater