Changed keys to environment Variables