Add support for IN clauses and GROUP BY