Added support for "raw query"