adding envs support