Updates for CollectionView support.