Added conditional fields