Preserve namespaces in Registry