Add support for groupBy, having and limit parameters.