Add diagnostics