Add support for CJ queries

:-)