Add initial row grouping