Adding group support (to be fix)