Added support for working directories.