Added new classes to better organize the JSON parsing code