Make phone number and cf optional