Add more parameters to command line tool