Eliminate FileStreamStorage
Add Finder