Refactored stats to metrics