Clarified optional fields