Fleshing out the JSON support