Updater is more friendly and added more rules