Added message grouping