Support JSON output with -json