Update Environment Variables Handling