Added cwd feature