Feature/grouped summaries