Added optional args to command line cmds