Added support for element xpath query