Refactoring Collection and CollectionItem isCollectionItem() functionality