Added a few more aggregators