Changing json converter to account for recent changes