Add operator tweaks
Prototype RandomQuery implementation