Add other types to give a more robust grouping proc#710