Changed #groupBy return type