Adding support for non-default namespaces