Added enviroment variables