Added grouping ability with cfg(groupBy)