Stats.as refactor