CDK-424: Improve CLI usability