Added grouping feature