Conditional additional set of fields