Added a custom JSON parser