CHANGE: refactored stats support