Added EMS diagnostics