Updates to JSON parsing method