Further improve LocaleManager