Reworked URL class