Added new JSON classes