Singlethreadedstore changes ported to concurrent store