Updated handling of snapshot env var