Further update to environment variables