Added unique namespace hack