Also, change the JSON format and update tests according to these changes
Attach a file by drag & drop or click to upload
