Add type restriction and I18n