Added some xml parsing