Update CLI support

use flag "--cli"