Validator and SchemaMatcher merged