Updated to use new CiviCrm entity relationship