More work on window xml parser