Improved StatsCollector