Changed format of environmental variables