Adding exports and environment support (again)