Improved URIGen