Refactored bulk finder
Made finder the default assumption for storage behaviour