Cli improvements