Fixed Filesystem storage, added InMemory storage.