Added queue to diagnostic service