Changing back the JSON implementation to xml-parsing