...
refactor schema validation