Changes on diagnostics