JSON support added