Add support for envars