Added diagnostics module