Improvements for Updater