Tweak the CLI tool