Updated CareGroup model