Allowing working directory to be passed via --cwd