Updated EnvSwitcher