Add Annotation and ResourceFilter for more automatic schema validation