COOPR-503: update cli according to last comments