Added conditional fields.