Added JSON output option