Updated with JSON output