Adding support for grouping with parenthesis