Slight changes to JSON output format