Fix: Better support for URIs