Diagnostic additions