Added support for the Query method coming in v9.6