Refactor Schema