add support for base where clauses