Added JSON Parsing methods
Resolve merge conflict