Added grouping in config