Update for GO Env-Variables