Updated docopt