Refactor workdir param