Integrated XMLParser stuff with rest of code