Added support for non-modular namespacing