Added some env vars