Almost finished refactoring Updater