Further refined the DOM structure