Updated JSON definitions