Properly use URIs