Updated environmental variables setting