More docopt work