Working on adding grouping support through config file