JSONParser changes, TODO: a lot of things must be fixed