More updated namespaces