Added support for command-line parameters