Updates for namespacing