Changed from xml to json

Significantly faster now