Update to form basic URL class