Change Container to CollectionType