Initial addition of JSON support