URL generator now Generator<URI> and renamed accordingly