Adding partial code for Diagnostic service