New parsing rules, corrected JSON output.