Added to diagnostics