Updates to CommCare method