expand to support multiple runs and aggregation