Added group/excludeGroup implementation