separated aggregation from raw token loading