Refactored JSON classes to return JSON objects instead of JSON formatted
strings