Update to use env var