Added i18n for autofill