Added structures for dynamic content grouping