Add more envars