Added xpath parsing