Adding XML functionality