Added cwd support