Adding option.env (from klei-migrate 0.3)