support for env-vars and env-vars-set