Modified CLI client to use URL parsing