Added new Environment class