Added env vars