Added some xpath stuff