adds support for complex namespace names