Inclusion of diagnostics