Some extra JSON support