Added support for native queries