Added in-memory storage