[REFACTOR] schema