Added some of the commands to CLI version.