Added support for xpath expressions