New JSON output modifications