Adding conditional fields to data schema