Finished refactor of updater