Namespacing improvements
Namespacing improvements