Replacing InMemoryStorage by DBStorage