Improve JSON Parsing