Added URL handling