Changed over to use the CliCommand base