Improved i18n structure