Modified i18n class