Refactored namespacing