Updated wording for optional fields

EV-551