Added source grouping