Updated to support new url::Url struct