Add cwd support