Adding support for Yb queries