Made ItemContainerGroup a bit more generic again