More work on json schema