refactoring, statistic entry service draft