Changes to support shared memory