Need to update to support an aggregate type. Currently it only supports 1 aggregate but should be able to bucket for different aggregates.