Added xml stuff