update the internal cli api following comments from kevin.