Mark optional fields as omitempty