I think this should be moved to the UpdaterTrait.