Added some more json-schema defs