Improve behavior for CLI tools