Added URL generation