Improved factorization of Updater class