Namespaces support refactoring