Improvements to Avro JSON Schema

Not there yet, though.