Added Table/CollectionView Support