adds support for where clauses