Add support for JSON output