Implementing support to raw queries