Addition of Env Vars - In Progress