Changes to make group report more generic.