Move options to command-line parameters