Updated to parse a URL