Add client side xpath support