Improved Xway::Cli spec