Added support for the new `--cwd` option