XML parsing improvements and better node management, with ability to replace node introduced