Implement Collections Management Improvements