Moved statistic-related methods to new module