Refactoring Storage responsibilities from TaskCollection