Minor changes towards working directory parse