[3.8] Use url generator