Updated for docopt