Adding grouping capabilities