Refactored namespaces