Added more enviroment elements