Add a few new aggregation types