Environment: Replace ENV with Environment.variable