Improved i18n loading