Refactor schema