Adding basic grouping.