Improving support subcommand in cli.