Structural changes for easy access to child nodes and text