Add count and average to stats