Added schema validation