Added in different aggregation functions