Updated the DOM Parser