Convert to new diagnostics