Fixed Collection Functionality