continued changes for namespaces