Add group_by() and index_by()