Reduce number of env vars required