Added group matching