Storing groups in a Map by Id instead of a List