Improved URI Gen Again