Working on the JSON Schema part