[TASK] Add support for custom raw query