Tagged companion-diagnostics