UrlGenerator added