Add "having" support