Added some environment variables