enhancements for JSON output