changes for container grouping