New URL class, other changes.