Improved the namespaces