Added support for json formatting