Now called QueryPlugin as I think that's a much nicer name.