Refactoring. Split updater logic onto separate commands