Some optimizations in Updater class
Some optimizations in Locale class