Add support for ni URIs