XML Parsing logic addition