Updated Namespacing Mechanism