Feature/diagnostics