Modified CLI to use command line arguments as parameters