Updated to new Url class