added environment_id to diagnose