Updated setupEnv