Fixed to use new grouping API