Added some xml-parsing goodies