Added group check