Add the ability to set/manage queries