Namespaces support patched