Added support for URL lookups