Adding support for anyOf, oneOf, not