Update to support goquery changes