CLI update

Add the CLI support