added support for in memory store