Added command-line parameters support