Upgraded with XML Parser