At least include the optional fields.