Added support for external URLs