Moved URL parse into URLUtils