Added the two new command-line options