[UNTESTED] Support for environment variables