Added more improvements about i18n and l10n