[REFACTOR] Use raw statistical data