Adding logging to Diagnostic service