Changes for shared memory manager