Added group and multi-group heatmaps.