Improved URI Generator Again
Improved URI Generator Again