Modified to fix in memory storage adapter find