fixing cmd tool issues due to refactoring