Fixed schema validation