Updates to add --url command line switch