Add in random-query ability