Added ability to perform shared queries