Improved i18n support