Improved URI Handling