Added aggregation options