Now configurable and has better messages grouping