Added a better xml parser