Added URL handling.