Enhanced CLI section.