COOPR-605: refactored code according to changes in common cli