Fix flow from the refactoring
Fix flow from the refactoring

svick/cli,dasMulli/cli,svick/cli,ravimeda/cli,johnbeisner/cli,ravimeda/cli,Faizan2304/cli,svick/cli,livarcocc/cli-1,dasMulli/cli,Faizan2304/cli,Faizan2304/cli,livarcocc/cli-1,harshjain2/cli,johnbeisner/cli,harshjain2/cli,livarcocc/cli-1,ravimeda/cli,johnbeisner/cli,harshjain2/cli,dasMulli/cli