Change with_env to with_envvar