Adding support for more queries.