In memory store hack in place.
Now working with in memory store