Updates to json parsing