Adding support for aliased where clauses