Refactor schema-table