Added environment vars