Added cli wrapper for 9K compatibility