Update environs to no longer depend on state