Added StatisticsFactory and mock