Converted DiagnosticsWrapper to singleton-class