Improved i18n capabilities