Added support for current working directory