Add handling for the Environment variable