Updated env setup