Improved URI/URL Implementation