Added env setup