SES-1791 : More changes to memory store and native store