[Updater] More intelligence