Added env var bits