Hopefully final JSON change

Updated JSON for more succinctness, python code reflects change.