Added support for XML