Added class JSON parsing