Make optional schema validation