Added: Support for grouped lists