Improve CLI for Console host