Refactor updaters