Heca cmd line refactoring - fix