Improve namespaces support