Adding more JSON parsing