Better handling of command line parameters