Schema parser refactoring