Added support for json output