Enhance support for passing URLs.