Added the splitGroupsByGroups feature