Move the env into generator also