added envs support