Verbose diagnostics added