Updater improvments