Improve software detection (tw-cli or tw_cli)