add non-current-working-directory support