Implemented messages grouping #177