Add support for XML values