Updater: More refinements