Changed XML parser

Changed XML parser