Adding support for json data