Added diagnostic aggregation