Added support for json-ready map output.