cwd support added