Use url generator where possbile