Update for namespaces