Json schema 2

No need for one-of anymore?