Added code to handle path to the working directory