More changes on json parsing