Fixing cli action bug
Cli enhancements