Modified the setup of environmental variables