Added new grouped by data set plotting