add support for custom URIs