improve namespacing capability