Working on expanmding the aggregation info