Fixed CollectionDAO