[Refactor] schema mapping