Added where clause visitor