Add additional diagnostics