Added diagnostics