Add environment
Change return type of eval