Add multi-grouping for metric table