User aggregation reworks