"group" usages replaced with "section"
Support for delegate to specify section indexes