Added --url and other options