add conditional fields