refactor, add search operation to storage