Added XML tree structure and more parsing