Adding simple schema validation