Accomodated new modelling of CampaignMember with lead/contact