Added support for XML matching