Improved i18n controller