Refactored accordingly the xml parsing process
Refactored accordingly the xml parsing process