add support for grouped options