Added support for exposing working directory