Improved URI Generator