Updated for cinder 0.8.5 (changes to XmlTree)