Refactored namespaces to use the new