Add environment vars support