SmallCLI improvement