Changed to generic URL handler.