Improve statistic collectors and reporting