Adding a grouped option to Data
Revision of data grouping