Looking at the tools/cli.py I can't tell if you can easily extend from the existing arguments? If not, I'll look at using the updated get_args() method from the first sample