I18n performance improvement