Refactored statistics