Improved JSON output