Bit rough, but works. I might still rewrite it all in perl ;) For now use xml files from 1.10 branch.