Refactoring BlockCollection