Integrate schema validation into main validator