Reenabled the unique namespace feature