Add support for 'group' syntax