Match XML output to Kind 1 and JKind