Update environment variable retrieval