Renamed GroupByContainerTraits to ContainerTraits