Improving grouping support (still fragile)