Cfy 1196 cli refactor