New env variable and handling