Stats features... Refactored again!