Bug 1484 - StatisticManager performance improvement refactoring