Added support for URLs