Added support for Query