Added xml parsing