Removed unnecessary limitations related to the command line parameters.