Add HAVING support