Add support for i18n again