Added support for raw queries to handle parameters