[REFACTOR] Working on schema