Add Environment implementation