Improved namespacing