Added some useful command line parameters support