Refactoring + Updater