Changing the URL generation