Refactoring: UserGroup is now CustomerGroup (naming change to better reflect the group)